[xserver-commit] xfree86/os-support xf86_OSlib.h,3.96,3.97 xf86_ansic.h,3.54,3.55 xf86_libc.h,3.64,3.65

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	xf86_OSlib.h xf86_ansic.h xf86_libc.h 
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_OSlib.h
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/xf86_OSlib.h,v
retrieving revision 3.96
retrieving revision 3.97
diff -u -d -r3.96 -r3.97
--- a/xf86_OSlib.h	19 Feb 2004 03:51:37 -0000	3.96
+++ b/xf86_OSlib.h	4 Mar 2004 02:33:00 -0000	3.97
@@ -83,6 +83,7 @@
  * Define some things from the "ANSI" C wrappers that are needed in the
  * the core server.
  */
+#if 0
 #ifndef HAVE_WRAPPER_DECLS
 #define HAVE_WRAPPER_DECLS
 #undef usleep
@@ -93,6 +94,7 @@
 typedef unsigned long xf86size_t;
 typedef signed long xf86ssize_t;
 #endif
+#endif
 
 #include <stdio.h>
 #include <ctype.h>
@@ -346,6 +348,7 @@
 # include <errno.h>
 
 # include <sys/stat.h>
+# include <string.h>
 
 # define HAS_USL_VTS
 # include <sys/mman.h>

Index: xf86_ansic.h
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/xf86_ansic.h,v
retrieving revision 3.54
retrieving revision 3.55
diff -u -d -r3.54 -r3.55
--- a/xf86_ansic.h	19 Feb 2004 03:51:37 -0000	3.54
+++ b/xf86_ansic.h	4 Mar 2004 02:33:01 -0000	3.55
@@ -28,25 +28,8 @@
 
 /* Handle <stdarg.h> */
 
-#ifndef IN_MODULE
-# include <stdarg.h>
-#else /* !IN_MODULE */
-# ifndef __OS2ELF__
-#  include <stdarg.h>
-# else /* __OS2ELF__ */
-   /* EMX/gcc_elf under OS/2 does not have native header files */
-#  if !defined (_VA_LIST)
-#   define _VA_LIST
-    typedef char *va_list;
-#  endif
-#  define _VA_ROUND(t) ((sizeof (t) + 3) & -4)
-#  if !defined (va_start)
-#   define va_start(ap,v) ap = (va_list)&v + ((sizeof (v) + 3) & -4)
-#   define va_end(ap) (ap = 0, (void)0)
-#   define va_arg(ap,t) (ap += _VA_ROUND (t), *(t *)(ap - _VA_ROUND (t)))
-#  endif
-# endif /* __OS2ELF__ */
-#endif /* IN_MODULE */
+#include <stdarg.h>
+#include <limits.h>
 
 /*
  * The first set of definitions are required both for modules and
@@ -55,7 +38,7 @@
 
 #if defined(XFree86LOADER) || defined(NEED_XF86_TYPES)
 
-#if !defined(SYSV) && !defined(SVR4) && !defined(Lynx) || defined(SCO)  
+#if !defined(SYSV) && !defined(SVR4) && !defined(Lynx) || defined(SCO)
 #define HAVE_VSSCANF
 #define HAVE_VFSCANF
 #endif 
@@ -134,7 +117,7 @@
 
 #endif /* XFree86LOADER || NEED_XF86_TYPES */
 
-#if defined(XFree86LOADER) || defined(NEED_XF86_PROTOTYPES)
+#if defined(NEED_XF86_PROTOTYPES)
 /*
  * ANSI C compilers only.
  */
@@ -319,20 +302,21 @@
 	(xf86getjmptype() == 1 ? xf86setjmp1((env), xf86setjmp1_arg2()) : \
 		xf86setjmperror((env))))
 
-#else /* XFree86LOADER || NEED_XF86_PROTOTYPES */
+#else /* NEED_XF86_PROTOTYPES */
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <string.h>
 #ifdef HAVE_SYSV_IPC
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #endif
 #include <sys/stat.h>
 #define stat_t struct stat
-#endif /* XFree86LOADER || NEED_XF86_PROTOTYPES */
+#endif /* NEED_XF86_PROTOTYPES */
 
 /*
  * These things are always required by drivers (but not by libc_wrapper.c),

Index: xf86_libc.h
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/xf86_libc.h,v
retrieving revision 3.64
retrieving revision 3.65
diff -u -d -r3.64 -r3.65
--- a/xf86_libc.h	19 Feb 2004 03:51:37 -0000	3.64
+++ b/xf86_libc.h	4 Mar 2004 02:33:01 -0000	3.65
@@ -52,7 +52,7 @@
  * libc_wrapper.c.
  */
 
-#if defined(XFree86LOADER) || defined(NEED_XF86_TYPES)
+#if defined(NEED_XF86_TYPES)
 
 /*
  * First, the new data types
@@ -207,7 +207,7 @@
  * to go into modules
  */
 
-#if defined(XFree86LOADER) && !defined(DONT_DEFINE_WRAPPERS)
+#if 0 && defined(XFree86LOADER) && !defined(DONT_DEFINE_WRAPPERS)
 
 #undef abort
 #define abort()			xf86abort()
@@ -692,7 +692,7 @@
 
 #endif /* XFree86LOADER  && !DONT_DEFINE_WRAPPERS */
 
-#if defined(XFree86LOADER) && \
+#if 0 && defined(XFree86LOADER) && \
     (!defined(DONT_DEFINE_WRAPPERS) || defined(DEFINE_SETJMP_WRAPPERS))
 #undef setjmp
 #define setjmp(a)               xf86setjmp_macro(a)