diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
| commit | 6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (patch) | |
| tree | 21e1af7ee94600e349ae21353dc11963a06e988d /xorg-server/dix/dixfonts.c | |
| parent | 75f57cf199b6c042b0f7515e3a1ab80f7ccecfab (diff) | |
| parent | d137057fd13e83ec15ab416c7fe774741da06047 (diff) | |
| download | vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.gz vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.bz2 vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/shm.c
xorg-server/Xext/sync.c
xorg-server/Xext/xf86bigfont.c
xorg-server/Xi/opendev.c
xorg-server/dix/dispatch.c
xorg-server/include/globals.h
xorg-server/mi/miinitext.c
Diffstat (limited to 'xorg-server/dix/dixfonts.c')
| -rw-r--r-- | xorg-server/dix/dixfonts.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c index aefd612fc..4feca742f 100644 --- a/xorg-server/dix/dixfonts.c +++ b/xorg-server/dix/dixfonts.c @@ -795,7 +795,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) reply.length = bytes_to_int32(stringLens + nnames); client->pSwapReplyFunc = ReplySwapVector[X_ListFonts]; WriteSwappedDataToClient(client, sizeof(xListFontsReply), &reply); - (void) WriteToClient(client, stringLens + nnames, bufferStart); + WriteToClient(client, stringLens + nnames, bufferStart); free(bufferStart); bail: @@ -1041,7 +1041,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c) pFP++; } WriteSwappedDataToClient(client, length, reply); - (void) WriteToClient(client, namelen, name); + WriteToClient(client, namelen, name); if (pFontInfo == &fontInfo) { free(fontInfo.props); free(fontInfo.isStringProp); |