diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2010-12-17 17:13:26 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2010-12-31 12:36:44 +0000 |
| commit | f7d8ade3c5ac44faf7f3ea0d846e35f75b31c9ec (patch) | |
| tree | ff2d1eb3bfa14a7af8de8288313f19f620b5d141 | |
| parent | 05e437c2ce230b588362f012c06ead5c6d89c006 (diff) | |
Resources: Move rClient to resource.h
The definition of rClient was duplicated across three source files, so
move it to resource.h.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | Xext/geext.c | 2 | ||||
| -rw-r--r-- | Xext/security.c | 2 | ||||
| -rw-r--r-- | dix/events.c | 2 | ||||
| -rw-r--r-- | include/resource.h | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/Xext/geext.c b/Xext/geext.c index 8319c9291..b37c1a0bd 100644 --- a/Xext/geext.c +++ b/Xext/geext.c @@ -33,8 +33,6 @@ #include "geext.h" #include "protocol-versions.h" -#define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) - DevPrivateKeyRec GEClientPrivateKeyRec; int RT_GECLIENT = 0; diff --git a/Xext/security.c b/Xext/security.c index 7eb95de74..8673880d1 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -154,8 +154,6 @@ SecurityLookupRequestName(ClientPtr client) } -#define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) - /* SecurityDeleteAuthorization * * Arguments: diff --git a/dix/events.c b/dix/events.c index ac0792360..4e2dd89da 100644 --- a/dix/events.c +++ b/dix/events.c @@ -195,8 +195,6 @@ typedef const char *string; #define XE_KBPTR (xE->u.keyButtonPointer) -#define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) - CallbackListPtr EventCallback; CallbackListPtr DeviceEventCallback; diff --git a/include/resource.h b/include/resource.h index 0c5a59dbc..080061f77 100644 --- a/include/resource.h +++ b/include/resource.h @@ -121,6 +121,8 @@ typedef unsigned long RESTYPE; #define BAD_RESOURCE 0xe0000000 +#define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) + /* Resource state callback */ extern _X_EXPORT CallbackListPtr ResourceStateCallback; |