diff options
| author | Keith Packard <keithp@keithp.com> | 2012-09-24 11:43:01 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-09-24 11:43:01 -0700 |
| commit | 4dd5989d15465f3f3480b521d4e36673972fa24a (patch) | |
| tree | 663c1ce4a48c3936054c80f889510028cf0f7687 /hw/xquartz | |
| parent | 0b02150c27e98f996e10d7489f9f67a30e4e3497 (diff) | |
| parent | 506e3437c73e5ae935ff7c056d7808fbb0c7e614 (diff) | |
Merge remote-tracking branch 'ajax/server-1.14-abi-churn'
Diffstat (limited to 'hw/xquartz')
| -rw-r--r-- | hw/xquartz/applewm.c | 4 | ||||
| -rw-r--r-- | hw/xquartz/xpr/appledri.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c index d41a81db3..aea0a45f2 100644 --- a/hw/xquartz/applewm.c +++ b/hw/xquartz/applewm.c @@ -612,7 +612,7 @@ ProcAppleWMDispatch(register ClientPtr client) return ProcAppleWMQueryVersion(client); } - if (!LocalClient(client)) + if (!client->local) return WMErrorBase + AppleWMClientNotLocal; switch (stuff->data) { @@ -684,7 +684,7 @@ SProcAppleWMDispatch(register ClientPtr client) REQUEST(xReq); /* It is bound to be non-local when there is byte swapping */ - if (!LocalClient(client)) + if (!client->local) return WMErrorBase + AppleWMClientNotLocal; /* only local clients are allowed WM access */ diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c index f77848f13..9aac07240 100644 --- a/hw/xquartz/xpr/appledri.c +++ b/hw/xquartz/xpr/appledri.c @@ -129,7 +129,7 @@ ProcAppleDRIQueryDirectRenderingCapable(register ClientPtr client) } rep.isCapable = isCapable; - if (!LocalClient(client)) + if (!client->local) rep.isCapable = 0; if (client->swapped) { @@ -354,7 +354,7 @@ ProcAppleDRIDispatch(register ClientPtr client) return ProcAppleDRIQueryDirectRenderingCapable(client); } - if (!LocalClient(client)) + if (!client->local) return DRIErrorBase + AppleDRIClientNotLocal; switch (stuff->data) { @@ -469,7 +469,7 @@ SProcAppleDRIDispatch(register ClientPtr client) return SProcAppleDRIQueryDirectRenderingCapable(client); } - if (!LocalClient(client)) + if (!client->local) return DRIErrorBase + AppleDRIClientNotLocal; switch (stuff->data) { |