On Fri, Dec 17, 2010 at 05:13:26PM +0000, Daniel Stone wrote: > The definition of rClient was duplicated across three source files, so > move it to resource.h. > > Signed-off-by: Daniel Stone <[email protected]> > --- > Xext/geext.c | 2 -- > Xext/security.c | 2 -- > dix/events.c | 2 -- > include/resource.h | 2 ++ > 4 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/Xext/geext.c b/Xext/geext.c > index 8319c92..b37c1a0 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 7eb95de..8673880 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 ac07923..4e2dd89 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 0c5a59d..080061f 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; > > -- > 1.7.2.3 >
merged, thanks. Cheers, Peter _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
