xserver/os log.c,3.1,3.2 utils.c,3.95,3.96

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	log.c utils.c 
Log Message:

	* configure.ac:
	* hw/xorg/Makefile.am:
	* hw/xorg/drivers/Makefile.am:
	* hw/xorg/drivers/fbdev:
	* hw/xorg/input/Makefile.am:
	* hw/xorg/input/mouse:
	Import fbdev and mouse drivers.

	* hw/xorg/common/xf86cmap.c:
	Test for whether pmap is !NULL, rather than just blindly calling
	CMapReinstallMap. This seems to break things, but meh.


Index: log.c
===================================================================
RCS file: /cvs/xserver/xserver/os/log.c,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -d -r3.1 -r3.2
--- a/log.c	1 May 2004 05:07:58 -0000	3.1
+++ b/log.c	3 May 2004 15:39:44 -0000	3.2
@@ -94,8 +94,6 @@
 void (*OsVendorVErrorFProc)(const char *, va_list args) = NULL;
 #endif
 
-#ifdef XFree86Server
-
 static FILE *logFile = NULL;
 static Bool logFlush = FALSE;
 static Bool logSync = FALSE;
@@ -607,5 +605,3 @@
     LogMessageVerb(X_NOT_IMPLEMENTED, -1, "not implemented, ");
     LogMessageVerb(X_UNKNOWN, -1, "unknown.\n");
 }
-
-#endif /* XFree86Server */

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