Hi all,

#ifdefs in include/eventstr.h:EventType enum can break modules.

Main problem is that EventType enumeration members can be different in
module and in server, which obviously causes problems. Would it be
possible to merge proposed patch to both master and 1.7 branches,
please? Thanks.

Regards, Adam

-- 
Adam Tkac, Red Hat, Inc.
>From dd6b23755e8f58af153c88e52a1efe03c6a6639f Mon Sep 17 00:00:00 2001
From: Adam Tkac <[email protected]>
Date: Mon, 21 Dec 2009 15:03:30 +0100
Subject: [PATCH] Do not define members of include/eventstr.h:EventType enum 
conditionally. It can
 break modules which are built in-tree.

Signed-off-by: Adam Tkac <[email protected]>
---
 include/eventstr.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/include/eventstr.h b/include/eventstr.h
index 0d5b1c6..79685c1 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 */
 };
 
-- 
1.6.6

_______________________________________________
xorg-devel mailing list
[email protected]
http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to