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>
This commit is contained in:
parent
871c1e17e5
commit
4fbe67beb5
|
@ -33,8 +33,6 @@
|
||||||
#include "geext.h"
|
#include "geext.h"
|
||||||
#include "protocol-versions.h"
|
#include "protocol-versions.h"
|
||||||
|
|
||||||
#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
|
|
||||||
|
|
||||||
DevPrivateKeyRec GEClientPrivateKeyRec;
|
DevPrivateKeyRec GEClientPrivateKeyRec;
|
||||||
|
|
||||||
int RT_GECLIENT = 0;
|
int RT_GECLIENT = 0;
|
||||||
|
|
|
@ -154,8 +154,6 @@ SecurityLookupRequestName(ClientPtr client)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
|
|
||||||
|
|
||||||
/* SecurityDeleteAuthorization
|
/* SecurityDeleteAuthorization
|
||||||
*
|
*
|
||||||
* Arguments:
|
* Arguments:
|
||||||
|
|
|
@ -195,8 +195,6 @@ typedef const char *string;
|
||||||
#define XE_KBPTR (xE->u.keyButtonPointer)
|
#define XE_KBPTR (xE->u.keyButtonPointer)
|
||||||
|
|
||||||
|
|
||||||
#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
|
|
||||||
|
|
||||||
CallbackListPtr EventCallback;
|
CallbackListPtr EventCallback;
|
||||||
CallbackListPtr DeviceEventCallback;
|
CallbackListPtr DeviceEventCallback;
|
||||||
|
|
||||||
|
|
|
@ -121,6 +121,8 @@ typedef unsigned long RESTYPE;
|
||||||
|
|
||||||
#define BAD_RESOURCE 0xe0000000
|
#define BAD_RESOURCE 0xe0000000
|
||||||
|
|
||||||
|
#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
|
||||||
|
|
||||||
/* Resource state callback */
|
/* Resource state callback */
|
||||||
extern _X_EXPORT CallbackListPtr ResourceStateCallback;
|
extern _X_EXPORT CallbackListPtr ResourceStateCallback;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user