frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Daniel Stone 2010-12-17 17:13:26 +00:00
parent 05e437c2ce
commit f7d8ade3c5
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xext/geext.c
View File

@ -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;

2
Xext/security.c
View File

@ -154,8 +154,6 @@ SecurityLookupRequestName(ClientPtr client)
} }
#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
/* SecurityDeleteAuthorization /* SecurityDeleteAuthorization
* *
* Arguments: * Arguments:

2
dix/events.c
View File

@ -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;

2
include/resource.h
View File

@ -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;