From 8d53d84485fdce8ea9686e6f300a69f7ddebd467 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Thu, 7 Jan 2010 15:34:52 +0100
Subject: Do not define members of include/eventstr.h:EventType enum
 conditionally.

Main problem is that EventType enumeration members can be different in
module and in server, which obviously causes problems.

Signed-off-by: Adam Tkac <atkac@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 include/eventstr.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/eventstr.h b/include/eventstr.h
index 0d5b1c62a..79685c1a6 100644
--- a/include/eventstr.h
+++ b/include/eventstr.h
@@ -58,17 +58,13 @@ enum EventType {
     ET_ProximityOut,
     ET_DeviceChanged,
     ET_Hierarchy,
-#if XFreeXDGA
     ET_DGAEvent,
-#endif
     ET_RawKeyPress,
     ET_RawKeyRelease,
     ET_RawButtonPress,
     ET_RawButtonRelease,
     ET_RawMotion,
-#ifdef XQUARTZ
     ET_XQuartz,
-#endif
     ET_Internal = 0xFF /* First byte */
 };
 
-- 
cgit v1.2.3