[xserver-commit] xfree86/common xf86.h,3.175,3.176 xf86Config.c,3.279,3.280 xf86Configure.c,3.83,3.84 xf86Helper.c,1.138,1.139 xf86Init.c,3.214,3.215 xisb.c,1.8,1.9

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xfree86/common
In directory pdx:/tmp/cvs-serv31959/common

Modified Files:
	xf86.h xf86Config.c xf86Configure.c xf86Helper.c xf86Init.c 
	xisb.c 
Log Message:
*.c, *.h, Makefile.am's, configure.ac:
Stop using NEED_XF86_PROTOTYPES, which means getting rid of the use of that
archaic xf86sprintf(), et al, crap.

Also, a few other miscellaneous build fixes.


Index: xf86.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86.h,v
retrieving revision 3.175
retrieving revision 3.176
diff -u -d -r3.175 -r3.176
--- a/xf86.h	28 Feb 2004 01:27:38 -0000	3.175
+++ b/xf86.h	4 Mar 2004 02:33:00 -0000	3.176
@@ -40,13 +40,7 @@
 #include "xf86str.h"
 #include "xf86Opt.h"
 #include <X11/Xfuncproto.h>
-#ifndef IN_MODULE
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#else
 #include "xf86_ansic.h"
-#endif
 
 #include "propertyst.h"
 

Index: xf86Config.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Config.c,v
retrieving revision 3.279
retrieving revision 3.280
diff -u -d -r3.279 -r3.280
--- a/xf86Config.c	28 Feb 2004 01:27:38 -0000	3.279
+++ b/xf86Config.c	4 Mar 2004 02:33:00 -0000	3.280
@@ -448,7 +448,7 @@
  * provided modules, pre-pending them to our own list.
  */
 static char **
-GenerateDriverlist(char * dirname, char * drivernames)
+GenerateDriverList(char * dirname, char * drivernames)
 {
     char *cp, **driverlist;
     int count;
@@ -903,11 +903,11 @@
 	    if (!xf86NameCmp(s,"flush")) {
 		xf86Msg(X_CONFIG, "Flushing logfile enabled\n");
 		xf86Info.log = LogFlush;
-		LogSetParameter(XLOG_FLUSH, TRUE);
+		/* LogSetParameter(XLOG_FLUSH, TRUE); */
 	    } else if (!xf86NameCmp(s,"sync")) {
 		xf86Msg(X_CONFIG, "Syncing logfile enabled\n");
 		xf86Info.log = LogSync;
-		LogSetParameter(XLOG_SYNC, TRUE);
+		/* LogSetParameter(XLOG_SYNC, TRUE); */
 	    } else {
 		xf86Msg(X_WARNING,"Unknown Log option\n");
 	    }

Index: xf86Configure.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Configure.c,v
retrieving revision 3.83
retrieving revision 3.84
diff -u -d -r3.83 -r3.84
--- a/xf86Configure.c	28 Feb 2004 01:27:38 -0000	3.83
+++ b/xf86Configure.c	4 Mar 2004 02:33:00 -0000	3.84
@@ -703,8 +703,8 @@
       /* when values available add DisplaySize option AS A COMMENT */
 
       displaySizeLen = snprintf(displaySize_string, displaySizeMaxLen,
-			        "\t#DisplaySize\t%5d %5d\t# mm\n",
-				mon_width, mon_height);
+			            "\t#DisplaySize\t%5d %5d\t# mm\n",
+				    mon_width, mon_height);
 
       if (displaySizeLen>0 && displaySizeLen<displaySizeMaxLen) {
 	if (ptr->mon_comment) {

Index: xf86Helper.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Helper.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- a/xf86Helper.c	28 Feb 2004 01:27:38 -0000	1.138
+++ b/xf86Helper.c	4 Mar 2004 02:33:00 -0000	1.139
@@ -40,6 +40,7 @@
 #include <config.h>
 #endif
 #include <X11/X.h>
+#include <strings.h>
 #include "os.h"
 #include "servermd.h"
 #include "pixmapstr.h"
@@ -1307,7 +1308,7 @@
 	    return;
 
 	snprintf(tmpFormat, PREFIX_SIZE + 1, "%s(%d): ",
-		 xf86Screens[scrnIndex]->name, scrnIndex);
+		     xf86Screens[scrnIndex]->name, scrnIndex);
 
 	strcat(tmpFormat, format);
 	LogVMessageVerb(type, verb, tmpFormat, args);
@@ -1399,7 +1400,7 @@
     if (xf86LogFileFrom == X_DEFAULT) {
 	/* Append the display number and ".log" */
 	lf = malloc(strlen(xf86LogFile) + strlen("%s") +
-		    strlen(LOGSUFFIX) + 1);
+	            strlen(LOGSUFFIX) + 1);
 	if (!lf)
 	    FatalError("Cannot allocate space for the log file name\n");
 	sprintf(lf, "%s%%s" LOGSUFFIX, xf86LogFile);

Index: xf86Init.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Init.c,v
retrieving revision 3.214
retrieving revision 3.215
diff -u -d -r3.214 -r3.215
--- a/xf86Init.c	28 Feb 2004 01:27:38 -0000	3.214
+++ b/xf86Init.c	4 Mar 2004 02:33:00 -0000	3.215
@@ -1253,7 +1253,7 @@
     int save = xf86Verbose;
 
     xf86Verbose = verb;
-    LogSetParameter(XLOG_VERBOSITY, verb);
+    /* LogSetParameter(XLOG_VERBOSITY, verb); */
     return save;
 }
 
@@ -1263,7 +1263,7 @@
     int save = xf86LogVerbose;
 
     xf86LogVerbose = verb;
-    LogSetParameter(XLOG_FILE_VERBOSITY, verb);
+    /* LogSetParameter(XLOG_FILE_VERBOSITY, verb); */
     return save;
 }
 

Index: xisb.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xisb.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/xisb.c	28 Feb 2004 01:27:38 -0000	1.8
+++ b/xisb.c	4 Mar 2004 02:33:00 -0000	1.9
@@ -39,16 +39,11 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#ifdef __UNIXOS2__
-#define I_NEED_OS2_H
-#endif
 
-#include <misc.h>
-#include <xf86.h>
-#include <xf86Version.h>
-#include <xf86_OSproc.h>
-#include <xf86_OSlib.h>
-#include <xf86Xinput.h>
+#include "misc.h"
+#include "xf86.h"
+#include "xf86Version.h"
+#include "xf86Xinput.h"
 #include "xisb.h"
 
 /*****************************************************************************