[xserver-commit] xfree86/common xf86.h,3.176,3.177 xf86Events.c,3.161,3.162

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xfree86/common
In directory pdx:/tmp/cvs-serv10820/common

Modified Files:
	xf86.h xf86Events.c 
Log Message:
My latest (probably misguided) attempt to get XFree86 to build - we're getting ever-closer.

Index: xf86.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86.h,v
retrieving revision 3.176
retrieving revision 3.177
diff -u -d -r3.176 -r3.177
--- a/xf86.h	4 Mar 2004 02:33:00 -0000	3.176
+++ b/xf86.h	5 Mar 2004 06:53:17 -0000	3.177
@@ -447,8 +447,9 @@
 
 /* this is an absolutely terrible hack to fix an absolutely terrible hack; the
  * wrong solution to the wrong problem. -daniel */
-Bool noXkbExtension = 0;
+static Bool noXkbExtension = 0;
 
+/* FIXME FIXME FIXME XXX FIXME FIXME */
 #define DEFAULT_MODULE_PATH "/opt/fdo/lib/xfree86/modules"
 #define DEFAULT_LOGPREFIX "/var/log/XFree86."
 #define XF86CONFIGFILE "/etc/xfree86.conf"

Index: xf86Events.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Events.c,v
retrieving revision 3.161
retrieving revision 3.162
diff -u -d -r3.161 -r3.162
--- a/xf86Events.c	28 Feb 2004 01:27:38 -0000	3.161
+++ b/xf86Events.c	5 Mar 2004 06:53:17 -0000	3.162
@@ -55,9 +55,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#ifdef __UNIXOS2__
-#define I_NEED_OS2_H
-#endif
 
 #include <X11/X.h>
 #include <X11/Xpoll.h>
@@ -89,11 +86,6 @@
 #include "xf86bigfont.h"
 #endif
 
-
-#ifdef XKB
-extern Bool noXkbExtension;
-#endif
-
 #define XE_POINTER  1
 #define XE_KEYBOARD 2