summaryrefslogtreecommitdiff
path: root/hw/xwin/winconfig.c
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2005-07-04 22:10:43 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2005-07-04 22:10:43 +0000
commit508cdb5cb01a91b1bf3ef31da80b6b1d36286bf0 (patch)
tree551e89f7936f87c5c3843e5a8ef396cbbd1eb196 /hw/xwin/winconfig.c
parent5e50ae22bf206d6c2cc05e772e05fa5a363acb81 (diff)
Include xwin-config.h if HAVE_XWIN_CONFIG is defined Cleanup X11 includes
handling Warning fixes
Diffstat (limited to 'hw/xwin/winconfig.c')
-rw-r--r--hw/xwin/winconfig.c5
1 files changed, 5 insertions, 0 deletions
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