summaryrefslogtreecommitdiff
path: root/XI.h
diff options
context:
space:
mode:
Diffstat (limited to 'XI.h')
-rw-r--r--XI.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/XI.h b/XI.h
index fe4981a..ec9bee2 100644
--- a/XI.h
+++ b/XI.h
@@ -1,5 +1,3 @@
-/* $Xorg: XI.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
/************************************************************
Copyright 1989, 1998 The Open Group
@@ -45,17 +43,12 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/include/extensions/XI.h,v 1.4 2001/01/17 17:53:16 dawes Exp $ */
/* Definitions used by the server, library and client */
#ifndef _XI_H_
#define _XI_H_
-#include <X11/Xmd.h> /* CARD32 */
-
-#define sz_xGetExtensionVersionReq 8
-#define sz_xGetExtensionVersionReply 32
#define sz_xListInputDevicesReq 4
#define sz_xListInputDevicesReply 32
#define sz_xOpenDeviceReq 8
@@ -263,12 +256,16 @@ SOFTWARE.
#define XI_DeviceBusy 3
#define XI_BadClass 4
-/* Make XEventClass be a CARD32 for 64 bit servers. Don't affect client
+/*
+ * Make XEventClass be a CARD32 for 64 bit servers. Don't affect client
* definition of XEventClass since that would be a library interface change.
* See the top of X.h for more _XSERVER64 magic.
+ *
+ * But, don't actually use the CARD32 type. We can't get it defined here
+ * without polluting the namespace.
*/
#ifdef _XSERVER64
-typedef CARD32 XEventClass;
+typedef unsigned int XEventClass;
#else
typedef unsigned long XEventClass;
#endif