summaryrefslogtreecommitdiff
path: root/hw/dmx/dmxclient.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-11-15 17:55:15 +0900
committerKeith Packard <keithp@keithp.com>2014-01-12 10:14:49 -0800
commitc85e26d59901fbf8c7a437cf934b51fa64160073 (patch)
tree4459508fa11ab3b8c4d797356089050f1f5d7d5b /hw/dmx/dmxclient.h
parent493d992501b586d95823e045d1dc994bd6c00d27 (diff)
Bunch of DMX warning fixes
Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw/dmx/dmxclient.h')
-rw-r--r--hw/dmx/dmxclient.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/hw/dmx/dmxclient.h b/hw/dmx/dmxclient.h
index 19dfdbe16..be8116f14 100644
--- a/hw/dmx/dmxclient.h
+++ b/hw/dmx/dmxclient.h
@@ -118,17 +118,6 @@ typedef XID KeySym64;
#undef KeySym
#endif
-/* These are in exglobals.h, but that conflicts with xkbsrv.h */
-extern int ProximityIn;
-extern int ProximityOut;
-extern int DeviceValuator;
-extern int DeviceMotionNotify;
-extern int DeviceFocusIn;
-extern int DeviceFocusOut;
-extern int DeviceStateNotify;
-extern int DeviceMappingNotify;
-extern int ChangeDeviceNotify;
-
/* Some protocol gets included last, after undefines. */
#include <X11/XKBlib.h>
#include <X11/extensions/XKBproto.h>