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/hw/kdrive/ephyr/ephyrdriext.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/hw/kdrive/ephyr/ephyrdriext.c')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyrdriext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c index a42be07d5..1a98a2dff 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c @@ -561,7 +561,7 @@ ProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client) return BadValue; } - if (!LocalClient(client) || client->swapped) + if (!client->local || client->swapped) isCapable = 0; rep = (xXF86DRIQueryDirectRenderingCapableReply) { @@ -1229,7 +1229,7 @@ ProcXF86DRIDispatch(register ClientPtr client) } } - if (!LocalClient(client)) + if (!client->local) return DRIErrorBase + XF86DRIClientNotLocal; switch (stuff->data) { |