diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-27 08:08:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-27 08:08:37 +0000 |
| commit | 958dcdff6d845fcff20a414bd28be8ee2ced8c6c (patch) | |
| tree | 3bc998a5af389cd1357dd672d96828573025cd0a /X11/extensions/Xge.h | |
| parent | 9b02c06e9c08d3d537d0a6fed3304b2146d49511 (diff) | |
| parent | bc4f49f9a9eccb73bc2c5610295febaf4b14559e (diff) | |
| download | vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.tar.gz vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.tar.bz2 vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'X11/extensions/Xge.h')
| -rw-r--r-- | X11/extensions/Xge.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/X11/extensions/Xge.h b/X11/extensions/Xge.h index 84fa250da..51382ffd0 100644 --- a/X11/extensions/Xge.h +++ b/X11/extensions/Xge.h @@ -38,12 +38,15 @@ _XFUNCPROTOBEGIN /** * Generic Event mask. * To be used whenever a list of masks per extension has to be provided. + * + * But, don't actually use the CARD{8,16,32} types. We can't get them them + * defined here without polluting the namespace. */ typedef struct { - CARD8 extension; - CARD8 pad0; - CARD16 pad1; - CARD32 evmask; + unsigned char extension; + unsigned char pad0; + unsigned short pad1; + unsigned int evmask; } XGenericEventMask; Bool XGEQueryExtension(Display* dpy, int *event_basep, int *err_basep); |