diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-08 09:06:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-08 09:06:44 +0200 |
| commit | 9b15e1cfe4c6ca9862c2865c4adbc21a758e9734 (patch) | |
| tree | 13452621f70604f08fd91b1bd46ed6341dbc2ea7 /xorg-server/Xext/xf86bigfont.c | |
| parent | bd13c464f728719fceb8a4918b52727ec125ea6e (diff) | |
| parent | de8397bc3d010bba24ec0c4d2e6249a769a86fc7 (diff) | |
| download | vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.gz vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.bz2 vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012
Conflicts:
xorg-server/Xext/xf86bigfont.c
xorg-server/dix/dispatch.c
xorg-server/include/dixstruct.h
xorg-server/os/connection.c
Diffstat (limited to 'xorg-server/Xext/xf86bigfont.c')
| -rw-r--r-- | xorg-server/Xext/xf86bigfont.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xorg-server/Xext/xf86bigfont.c b/xorg-server/Xext/xf86bigfont.c index 2bc5fc93f..42f5549be 100644 --- a/xorg-server/Xext/xf86bigfont.c +++ b/xorg-server/Xext/xf86bigfont.c @@ -278,9 +278,10 @@ ProcXF86BigfontQueryVersion(ClientPtr client) xXF86BigfontQueryVersionReply reply; REQUEST_SIZE_MATCH(xXF86BigfontQueryVersionReq); + reply.type = X_Reply; - reply.length = 0; reply.sequenceNumber = client->sequence; + reply.length = 0; reply.majorVersion = SERVER_XF86BIGFONT_MAJOR_VERSION; reply.minorVersion = SERVER_XF86BIGFONT_MINOR_VERSION; #ifdef WIN32 @@ -292,7 +293,8 @@ ProcXF86BigfontQueryVersion(ClientPtr client) #endif #ifdef HAS_SHM reply.signature = signature; - reply.capabilities = (LocalClient(client) && !client->swapped ? XF86Bigfont_CAP_LocalShm : 0); + reply.capabilities = (client->local && !client->swapped) + ? XF86Bigfont_CAP_LocalShm : 0 #else reply.signature = 0; /* This is redundant. Avoids uninitialized memory. */ reply.capabilities = 0; @@ -360,7 +362,7 @@ ProcXF86BigfontQueryFont(ClientPtr client) #else switch (client->req_len) { case 2: /* client with version 1.0 libX11 */ - stuff_flags = (LocalClient(client) && + stuff_flags = (client->local && !client->swapped ? XF86Bigfont_FLAGS_Shm : 0); break; case 3: /* client with version 1.1 libX11 */ |