xserver/include os.h,3.49,3.50

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	os.h 
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: os.h
===================================================================
RCS file: /cvs/xserver/xserver/include/os.h,v
retrieving revision 3.49
retrieving revision 3.50
diff -u -d -r3.49 -r3.50
--- a/os.h	10 Mar 2004 11:49:11 -0000	3.49
+++ b/os.h	25 Apr 2004 10:25:39 -0000	3.50
@@ -275,8 +275,6 @@
 
 extern int auditTrailLevel;
 
-extern void AuditPrefix(const char *);
-
 extern void AuditF(const char* /*f*/, ...);
 
 extern void FatalError(const char* /*f*/, ...)
@@ -286,6 +284,7 @@
 #endif
 ;
 
+
 extern void ErrorF(const char* /*f*/, ...);
 
 extern void VErrorF(const char *f, va_list args);
@@ -525,4 +524,24 @@
     X_UNKNOWN = -1		/* Unknown - must always be last. */
 } MessageType;
 
+extern const char *LogInit(const char *fname, const char *backup);
+extern void LogClose(void);
+extern Bool LogSetParameter(LogParameter param, int value);
+extern void LogVWrite(int verb, const char *f, va_list args);
+extern void LogWrite(int verb, const char *f, ...);
+extern void LogVMessageVerb(MessageType type, int verb, const char *format,
+			    va_list args);
+extern void LogMessageVerb(MessageType type, int verb, const char *format,
+			   ...);
+extern void LogMessage(MessageType type, const char *format, ...);
+extern void FreeAuditTimer(void);
+extern void AuditF(const char *f, ...);
+extern void VAuditF(const char *f, va_list args);
+extern void FatalError(const char *f, ...)
+#if defined(__GNUC__) && \
+    ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4)))
+__attribute((noreturn))
+#endif
+;
+
 #endif /* OS_H */