xserver/os utils.c,3.94,3.95

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/os
In directory pdx:/tmp/cvs-serv7398

Modified Files:
	utils.c 
Log Message:
Really fix util.c's ErrorF/et al braindamage by wrapping them with #ifndef
XFree86Server; kinda helps if I commit the right version, not the broken
version.

Of course, this means that you can't use the same DIX for both KDrive and Xorg
(e.g. --enable-xorgserver and --enable-kdriveserver are mutually exclusive), but
this isn't the only reason. Just one of them.


Index: utils.c
===================================================================
RCS file: /cvs/xserver/xserver/os/utils.c,v
retrieving revision 3.94
retrieving revision 3.95
diff -u -d -r3.94 -r3.95
--- a/utils.c	25 Apr 2004 10:25:40 -0000	3.94
+++ b/utils.c	25 Apr 2004 10:29:42 -0000	3.95
@@ -443,7 +443,7 @@
     exit (1);
 }
 
-#if 0
+#ifndef XFree86Server
 void
 Error(char *str)
 {
@@ -1360,7 +1360,8 @@
     }
 }
 
-#if 0
+/* Xorg's DDX defines its own versions of these. */
+#ifndef XFree86Server
 void
 AuditF(const char * f, ...)
 {
@@ -1443,7 +1444,7 @@
     VErrorF(f, args);
     va_end(args);
 }
-#endif
+#endif /* XFree86Server */
 
 #ifdef SMART_SCHEDULE