From 1d933800acfa31f0a8f014224c1708f0076f3db0 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 3 Mar 2009 15:58:24 +1000
Subject: [PATCH] Move CH_* constants to xi2

---
 XI.h  | 7 -------
 XI2.h | 6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/XI.h b/XI.h
index 2a885ea..727621a 100644
--- a/XI.h
+++ b/XI.h
@@ -274,13 +274,6 @@ SOFTWARE.
 #define DeviceUnrecoverable      4
 #define DeviceControlChanged     5
 
-
-/* ChangeHierarchy constants */
-#define CH_CreateMasterDevice    1
-#define CH_RemoveMasterDevice    2
-#define CH_AttachSlave           3
-#define CH_DetachSlave           4
-
 #define AttachToMaster           1
 #define Floating                 2
 
diff --git a/XI2.h b/XI2.h
index f612759..ac6e0ed 100644
--- a/XI2.h
+++ b/XI2.h
@@ -39,6 +39,12 @@
 #define HF_DeviceEnabled            (1 << 6)
 #define HF_DeviceDisabled           (1 << 7)
 
+/* ChangeHierarchy constants */
+#define CH_CreateMasterDevice    1
+#define CH_RemoveMasterDevice    2
+#define CH_AttachSlave           3
+#define CH_DetachSlave           4
+
 /* Valuator modes */
 #define ModeRelative                    0
 #define ModeAbsolute                    1
-- 
2.7.4