Index: xc/programs/Xserver/GL/glx/single2.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/glx/single2.c,v
retrieving revision 1.4
diff -u -r1.4 single2.c
--- xc/programs/Xserver/GL/glx/single2.c	21 Jun 2004 13:35:05 -0000	1.4
+++ xc/programs/Xserver/GL/glx/single2.c	18 Jul 2004 17:26:31 -0000
@@ -42,7 +42,7 @@
 #include "g_disptab.h"
 #include "GL/glx_ansic.h"
 
-#ifdef __CYGWIN__ /* should be XFree86Server */
+#if !defined(XFee86Module)
 #define xf86atof atof
 #endif
 
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v
retrieving revision 1.5
diff -u -r1.5 i810_driver.c
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c	6 Jul 2004 14:37:47 -0000	1.5
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c	18 Jul 2004 17:26:33 -0000
@@ -345,6 +345,8 @@
 #endif
 #endif
 
+int I830EntityIndex = -1;
+
 #ifdef XFree86LOADER
 
 static MODULESETUPPROTO(i810Setup);
@@ -364,8 +366,6 @@
 
 XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, 0 };
 
-int I830EntityIndex = -1;
-
 static pointer
 i810Setup(pointer module, pointer opts, int *errmaj, int *errmin)
 {