From 508cdb5cb01a91b1bf3ef31da80b6b1d36286bf0 Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon, 4 Jul 2005 22:10:43 +0000
Subject: Include xwin-config.h if HAVE_XWIN_CONFIG is defined Cleanup X11
 includes     handling Warning fixes

---
 hw/xwin/winconfig.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'hw/xwin/winconfig.c')

diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c
index 1764dd3d5..917ce08c0 100644
--- a/hw/xwin/winconfig.c
+++ b/hw/xwin/winconfig.c
@@ -29,13 +29,18 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winconfig.h"
 #include "winmsg.h"
 #include "globals.h"
 
 #ifdef XKB
+#ifndef XKB_IN_SERVER
 #define XKB_IN_SERVER
+#endif
 #include <X11/extensions/XKBsrv.h>
 #endif
 
-- 
cgit v1.2.3