xserver/os Makefile.am,3.10,3.11 utils.c,3.93,3.94

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	Makefile.am utils.c 
Log Message:
Doing a reimport of the Xorg DDX, and hw/xizzle->hw/xorg.

configure.ac, Makefile.am, et al changed accordingly.

os/* braindamage fixed to the satisfaction of both Xorg and KDrive - fixed
the case where ErrorF() couldn't be satisfactorily defined in the DIX because
KDrive just spat stuff out to the screen, and Xorg logged it too.

xkb, Xi, et al: XFree86 extensions added and fixed for proper usage of includes,
and to build properly.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/os/Makefile.am,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- a/Makefile.am	11 Nov 2003 22:43:34 -0000	3.10
+++ b/Makefile.am	25 Apr 2004 10:25:39 -0000	3.11
@@ -21,6 +21,7 @@
 	auth.c		\
 	connection.c	\
 	io.c		\
+	log.c		\
 	mitauth.c	\
 	oscolor.c	\
 	osdep.h		\

Index: utils.c
===================================================================
RCS file: /cvs/xserver/xserver/os/utils.c,v
retrieving revision 3.93
retrieving revision 3.94
diff -u -d -r3.93 -r3.94
--- a/utils.c	19 Apr 2004 18:45:19 -0000	3.93
+++ b/utils.c	25 Apr 2004 10:25:40 -0000	3.94
@@ -443,11 +443,13 @@
     exit (1);
 }
 
+#if 0
 void
 Error(char *str)
 {
     perror(str);
 }
+#endif
 
 #ifndef DDXTIME
 CARD32
@@ -1358,6 +1360,7 @@
     }
 }
 
+#if 0
 void
 AuditF(const char * f, ...)
 {
@@ -1440,6 +1443,7 @@
     VErrorF(f, args);
     va_end(args);
 }
+#endif
 
 #ifdef SMART_SCHEDULE