===================================================================
RCS file: /cvs/prex-old/usr/include/stdio.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- prex-old/usr/include/stdio.h	2008/06/03 10:38:47	1.1.1.1
+++ prex-old/usr/include/stdio.h	2008/08/13 17:12:36	1.1.1.1.2.1
@@ -38,14 +38,21 @@
 #include <sys/types.h>
 #include <sys/cdefs.h>
 
-#include <machine/ansi.h>
-#ifdef	_BSD_SIZE_T_
-typedef	_BSD_SIZE_T_	size_t;
-#undef	_BSD_SIZE_T_
+#if !defined(_SIZE_T)
+#define _SIZE_T
+typedef	unsigned int	size_t;		/* size of something in bytes */
 #endif
 
-#include <sys/null.h>
+#include <machine/stdarg.h>
 
+#ifndef	NULL
+#if !defined(__cplusplus)
+#define	NULL	((void *)0)
+#else
+#define	NULL	0
+#endif
+#endif
+
 typedef off_t fpos_t;
 
 #define	_FSTDIO			/* Define for new stdio with functions. */
@@ -216,9 +223,9 @@
 FILE	*tmpfile(void);
 char	*tmpnam(char *);
 int	 ungetc(int, FILE *);
-int	 vfprintf(FILE *, const char *, _BSD_VA_LIST_);
-int	 vprintf(const char *, _BSD_VA_LIST_);
-int	 vsprintf(char *, const char *, _BSD_VA_LIST_);
+int	 vfprintf(FILE *, const char *, va_list);
+int	 vprintf(const char *, va_list);
+int	 vsprintf(char *, const char *, va_list);
 __END_DECLS
 
 /*
@@ -249,9 +256,9 @@
 int	 setlinebuf(FILE *);
 char	*tempnam(const char *, const char *);
 int	 snprintf(char *, size_t, const char *, ...);
-int	 vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_);
-int	 vscanf(const char *, _BSD_VA_LIST_);
-int	 vsscanf(const char *, const char *, _BSD_VA_LIST_);
+int	 vsnprintf(char *, size_t, const char *, va_list);
+int	 vscanf(const char *, va_list);
+int	 vsscanf(const char *, const char *, va_list);
 FILE	*zopen(const char *, const char *, int);
 __END_DECLS
 
@@ -269,7 +276,7 @@
  */
 __BEGIN_DECLS
 int	__srget(FILE *);
-int	__svfscanf(FILE *, const char *, _BSD_VA_LIST_);
+int	__svfscanf(FILE *, const char *, va_list);
 int	__swbuf(int, FILE *);
 __END_DECLS