[xserver-commit] xserver/include opaque.h,1.12,1.13 os.h,3.48,3.49 site.h,1.9,1.10

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	opaque.h os.h site.h 
Log Message:
Twenty link errors for Xizzle now - count 'em. 20.

        * *.c:
        * *.h:
        Get rid of all references to SCO.

        * hw/xizzle/*/Makefile.am:
        Change SDK include dir to $(includedir)/xizzle.
        Add SDK libs where necessary.

        * hw/xizzle/Makefile.am:
        Reformat to be nicer and easier to shuffle around; also, fix lib
        ordering so we get so much closer to the elusive final link.
        Shuffle common/xf86Init.c into libxizzle.a.

        * hw/xizzle/common/Makefile.am:
        Fix a couple of early snafus - s/BUILDXI/XINPUT/, et al; make the SDK
        stuff conditional as needed; fix the SBus includes.

        * hw/xizzle/os-support/Makefile.am:
        Name library os-support/libxizzleos.a, not
        os-support/foo/libxizzlefoo.a.
        Clean up ARCH_SOURCES so it's always initialised to something.

        * hw/xizzle/os-support/linux/Makefile.am:
        Move linked libraries to _LIBADD, which somehow escaped my attention.
        Make inclusion of drm/libxizzlelinuxdrm.a dependent on DRI.

        * hw/xizzle/vbe/vbe.c:
        s/VERSION/VBE_VERSION/;

        * hw/xizzle/Xi:
        Axe this redundant dir.

        * configure.ac:
        All Xizzle-specific: axe hw/xizzle/Xi, shuffle link order, fix list of
        required modules to be vaguely sane, add some pertinent libs/incs.


Index: opaque.h
===================================================================
RCS file: /cvs/xserver/xserver/include/opaque.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/opaque.h	11 Sep 2003 05:12:51 -0000	1.12
+++ b/opaque.h	10 Mar 2004 11:49:11 -0000	1.13
@@ -75,8 +75,9 @@
 extern Bool permitOldBugs;
 extern Bool defeatAccessControl;
 extern char* protNoListen;
+extern long maxBigRequestSize;
 extern Bool blackRoot;
 
-
+extern Bool coreDump;
 
 #endif /* OPAQUE_H */

Index: os.h
===================================================================
RCS file: /cvs/xserver/xserver/include/os.h,v
retrieving revision 3.48
retrieving revision 3.49
diff -u -d -r3.48 -r3.49
--- a/os.h	2 Nov 2003 19:56:10 -0000	3.48
+++ b/os.h	10 Mar 2004 11:49:11 -0000	3.49
@@ -322,10 +322,14 @@
 extern int System(char *);
 extern pointer Popen(char *, char *);
 extern int Pclose(pointer);
+extern pointer Fopen(char *, char *);
+extern int Fclose(pointer);
 #else
 #define System(a) system(a)
 #define Popen(a,b) popen(a,b)
 #define Pclose(a) pclose(a)
+#define Fopen(a,b) fopen(a,b)
+#define Fclose(a) fclose(a)
 #endif
 
 extern void CheckUserParameters(int argc, char **argv, char **envp);
@@ -498,4 +502,27 @@
 extern void ddxGiveUp(void);
 extern int TimeSinceLastInputEvent(void);
 
+/* Logging. */
+typedef enum _LogParameter {
+    XLOG_FLUSH,
+    XLOG_SYNC,
+    XLOG_VERBOSITY,
+    XLOG_FILE_VERBOSITY
+} LogParameter;
+
+/* Flags for log messages. */
+typedef enum {
+    X_PROBED,			/* Value was probed. */
+    X_CONFIG,			/* Value was given in the config file. */
+    X_DEFAULT,			/* Value is a default. */
+    X_CMDLINE,			/* Value was given on the command line. */
+    X_NOTICE,			/* Notice */
+    X_ERROR,			/* Error message */
+    X_WARNING,			/* Warning */
+    X_INFO,			/* Informational message */
+    X_NONE,			/* No prefix */
+    X_NOT_IMPLEMENTED,		/* Not implemented */
+    X_UNKNOWN = -1		/* Unknown - must always be last. */
+} MessageType;
+
 #endif /* OS_H */

Index: site.h
===================================================================
RCS file: /cvs/xserver/xserver/include/site.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/site.h	11 Sep 2003 05:12:51 -0000	1.9
+++ b/site.h	10 Mar 2004 11:49:11 -0000	1.10
@@ -63,7 +63,7 @@
  * by the vendor.
  */
 #ifndef VENDOR_RELEASE
-#define VENDOR_RELEASE	6600
+#define VENDOR_RELEASE	7000
 #endif
 
 /*
@@ -128,4 +128,11 @@
 #define DEFAULT_ACCESS_CONTROL TRUE
 #endif
 
+#ifndef DEFAULT_LOG_VERBOSITY
+#define DEFAULT_LOG_VERBOSITY		0
+#endif
+#ifndef DEFAULT_LOG_FILE_VERBOSITY
+#define DEFAULT_LOG_FILE_VERBOSITY	3
+#endif
+
 #endif /* SITE_H */