From b6b26560d65d9468c89dd046396d9aeb14e1b227 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri, 31 Oct 2008 16:23:34 +1030
Subject: [PATCH] Move EXTENSION_BASE and EXTENSION_EVENT_BASE to misc.h.

---
 Xext/xtest.c     | 1 -
 Xi/sendexev.c    | 1 -
 dix/events.c     | 2 --
 dix/extension.c  | 2 --
 include/misc.h   | 3 +++
 xkb/xkbPrKeyEv.c | 1 -
 6 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Xext/xtest.c b/Xext/xtest.c
index fbf2a2728..1290a236c 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -48,7 +48,6 @@
 #include <X11/extensions/xteststr.h>
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#define EXTENSION_EVENT_BASE	64
 
 #include "modinit.h"
 
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index 8c975e3a3..9b37de307 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -50,7 +50,6 @@ SOFTWARE.
  *
  */
 
-#define EXTENSION_EVENT_BASE  64
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
diff --git a/dix/events.c b/dix/events.c
index aa10b02d6..6833a6bca 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -179,8 +179,6 @@ int    xeviegrabState = 0;
 /**
  * Extension events type numbering starts at EXTENSION_EVENT_BASE.
  */
-#define EXTENSION_EVENT_BASE  64
-
 #define NoSuchEvent 0x80000000	/* so doesn't match NoEventMask */
 #define StructureAndSubMask ( StructureNotifyMask | SubstructureNotifyMask )
 #define AllButtonsMask ( \
diff --git a/dix/extension.c b/dix/extension.c
index ccd9362fc..3070f4da1 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -63,8 +63,6 @@ SOFTWARE.
 #include "registry.h"
 #include "xace.h"
 
-#define EXTENSION_BASE  128
-#define EXTENSION_EVENT_BASE  64
 #define LAST_EVENT  128
 #define LAST_ERROR 255
 
diff --git a/include/misc.h b/include/misc.h
index 3ecc9f27c..85f9e5d4f 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -91,6 +91,9 @@ extern unsigned long serverGeneration;
 #define MAXFORMATS	8
 #define MAXDEVICES	20 /* input devices */
 
+#define EXTENSION_EVENT_BASE 64
+#define EXTENSION_BASE 128
+
 typedef unsigned long PIXEL;
 typedef unsigned long ATOM;
 
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index 74d02c608..a3f715c7d 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -39,7 +39,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "exevents.h"
 #include <xkbsrv.h>
 #include <ctype.h>
-#define EXTENSION_EVENT_BASE 64
 
 /***====================================================================***/