From 8f5aa38abf1158a789b5528df9d98826342e30cf Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 7 Jun 2006 12:33:44 -0700
Subject: fix compiler warning about XKB_IN_SERVER redefinition

---
 dix/devices.c  | 2 ++
 dix/dispatch.c | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'dix')

diff --git a/dix/devices.c b/dix/devices.c
index ef1bdf354..c7d3494e8 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -66,7 +66,9 @@ SOFTWARE.
 #include "cursorstr.h"
 #include "dixstruct.h"
 #include "site.h"
+#ifndef XKB_IN_SERVER
 #define	XKB_IN_SERVER
+#endif
 #ifdef XKB
 #include <X11/extensions/XKBsrv.h>
 #endif
diff --git a/dix/dispatch.c b/dix/dispatch.c
index c8ee8d610..04e2ba11f 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -115,7 +115,9 @@ int ProcInitialConnection();
 #include <X11/extensions/Xagsrv.h>
 #endif
 #ifdef XKB
+#ifndef XKB_IN_SERVER
 #define XKB_IN_SERVER
+#endif
 #include "inputstr.h"
 #include <X11/extensions/XKBsrv.h>
 #endif
-- 
cgit v1.2.3