prefix all ANSI #define's with BSD_ so don't collide with other vendors

SCCS-vsn: include/stddef.h 5.6
SCCS-vsn: include/stdio.h 5.21
SCCS-vsn: include/stdlib.h 5.18
SCCS-vsn: include/string.h 5.11
SCCS-vsn: include/time.h 5.13
SCCS-vsn: sys/hp300/include/ansi.h 7.3
SCCS-vsn: include/stdio.h 5.22
SCCS-vsn: sys/sys/syslog.h 7.22
SCCS-vsn: include/stdio.h 5.21

diff --git a/usr/src/include/stddef.h b/usr/src/include/stddef.h
index 117bce1..27d7d72 100644 (file)
--- a/usr/src/include/stddef.h
+++ b/usr/src/include/stddef.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)stddef.h    5.5 (Berkeley) %G%
+ *     @(#)stddef.h    5.6 (Berkeley) %G%

  */
 
 #ifndef _STDDEF_H_
  */
 
 #ifndef _STDDEF_H_


@@ -12,16 +12,16 @@
 
 #include <machine/ansi.h>
 
 
 #include <machine/ansi.h>
 

-typedef        _PTRDIFF_T_     ptrdiff_t;
+typedef        _BSD_PTRDIFF_T_ ptrdiff_t;

 
 

-#ifdef _SIZE_T_
-typedef        _SIZE_T_        size_t;
-#undef _SIZE_T_
+#ifdef _BSD_SIZE_T_
+typedef        _BSD_SIZE_T_    size_t;
+#undef _BSD_SIZE_T_

 #endif
 
 #endif
 

-#ifdef _WCHAR_T_
-typedef        _WCHAR_T_       wchar_t;
-#undef _WCHAR_T_
+#ifdef _BSD_WCHAR_T_
+typedef        _BSD_WCHAR_T_   wchar_t;
+#undef _BSD_WCHAR_T_

 #endif
 
 #ifndef        NULL
 #endif
 
 #ifndef        NULL

diff --git a/usr/src/include/stdio.h b/usr/src/include/stdio.h
index b078f47..8168b81 100644 (file)
--- a/usr/src/include/stdio.h
+++ b/usr/src/include/stdio.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)stdio.h     5.20 (Berkeley) %G%
+ *     @(#)stdio.h     5.21 (Berkeley) %G%

  */
 
 #ifndef        _STDIO_H_
  */
 
 #ifndef        _STDIO_H_


@@ -17,9 +17,9 @@
 #include <sys/cdefs.h>
 
 #include <machine/ansi.h>
 #include <sys/cdefs.h>
 
 #include <machine/ansi.h>

-#ifdef _SIZE_T_
-typedef        _SIZE_T_        size_t;
-#undef _SIZE_T_
+#ifdef _BSD_SIZE_T_
+typedef        _BSD_SIZE_T_    size_t;
+#undef _BSD_SIZE_T_

 #endif
 
 #ifndef NULL
 #endif
 
 #ifndef NULL


@@ -210,9 +210,9 @@ int  sscanf __P((char *, const char *, ...));
 FILE   *tmpfile __P((void));
 char   *tmpnam __P((char *));
 int     ungetc __P((int, FILE *));
 FILE   *tmpfile __P((void));
 char   *tmpnam __P((char *));
 int     ungetc __P((int, FILE *));

-int     vfprintf __P((FILE *, const char *, _VA_LIST_));
-int     vprintf __P((const char *, _VA_LIST_));
-int     vsprintf __P((char *, const char *, _VA_LIST_));
+int     vfprintf __P((FILE *, const char *, _BSD_VA_LIST_));
+int     vprintf __P((const char *, _BSD_VA_LIST_));
+int     vsprintf __P((char *, const char *, _BSD_VA_LIST_));

 __END_DECLS
 
 /*
 __END_DECLS
 
 /*


@@ -244,9 +244,9 @@ void         setbuffer __P((FILE *, char *, int));
 int     setlinebuf __P((FILE *));
 char   *tempnam __P((const char *, const char *));
 int     snprintf __P((char *, size_t, const char *, ...));
 int     setlinebuf __P((FILE *));
 char   *tempnam __P((const char *, const char *));
 int     snprintf __P((char *, size_t, const char *, ...));

-int     vsnprintf __P((char *, size_t, const char *, _VA_LIST_));
-int     vscanf __P((const char *, _VA_LIST_));
-int     vsscanf __P((const char *, const char *, _VA_LIST_));
+int     vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_));
+int     vscanf __P((const char *, _BSD_VA_LIST_));
+int     vsscanf __P((const char *, const char *, _BSD_VA_LIST_));

 __END_DECLS
 
 /*
 __END_DECLS
 
 /*


@@ -275,7 +275,7 @@ __END_DECLS
  */
 __BEGIN_DECLS
 int    __srget __P((FILE *));
  */
 __BEGIN_DECLS
 int    __srget __P((FILE *));

-int    __svfscanf __P((FILE *, const char *, _VA_LIST_));
+int    __svfscanf __P((FILE *, const char *, _BSD_VA_LIST_));

 int    __swbuf __P((int, FILE *));
 __END_DECLS
 
 int    __swbuf __P((int, FILE *));
 __END_DECLS
 

diff --git a/usr/src/include/stdlib.h b/usr/src/include/stdlib.h
index 275ee56..4c15d98 100644 (file)
--- a/usr/src/include/stdlib.h
+++ b/usr/src/include/stdlib.h
@@ -4,21 +4,21 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)stdlib.h    5.17 (Berkeley) %G%
+ *     @(#)stdlib.h    5.18 (Berkeley) %G%

  */
 
 #ifndef _STDLIB_H_
 #define _STDLIB_H_
 #include <sys/types.h>
 
  */
 
 #ifndef _STDLIB_H_
 #define _STDLIB_H_
 #include <sys/types.h>
 

-#ifdef _SIZE_T_
-typedef        _SIZE_T_        size_t;
-#undef _SIZE_T_
+#ifdef _BSD_SIZE_T_
+typedef        _BSD_SIZE_T_    size_t;
+#undef _BSD_SIZE_T_

 #endif
 
 #endif
 

-#ifdef _WCHAR_T_
-typedef        _WCHAR_T_       wchar_t;
-#undef _WCHAR_T_
+#ifdef _BSD_WCHAR_T_
+typedef        _BSD_WCHAR_T_   wchar_t;
+#undef _BSD_WCHAR_T_

 #endif
 
 typedef struct {
 #endif
 
 typedef struct {

diff --git a/usr/src/include/string.h b/usr/src/include/string.h
index 8e70eb2..5f89c8a 100644 (file)
--- a/usr/src/include/string.h
+++ b/usr/src/include/string.h
@@ -4,16 +4,16 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)string.h    5.10 (Berkeley) %G%
+ *     @(#)string.h    5.11 (Berkeley) %G%

  */
 
 #ifndef _STRING_H_
 #define        _STRING_H_
 #include <machine/ansi.h>
 
  */
 
 #ifndef _STRING_H_
 #define        _STRING_H_
 #include <machine/ansi.h>
 

-#ifdef _SIZE_T_
-typedef        _SIZE_T_        size_t;
-#undef _SIZE_T_
+#ifdef _BSD_SIZE_T_
+typedef        _BSD_SIZE_T_    size_t;
+#undef _BSD_SIZE_T_

 #endif
 
 #ifndef        NULL
 #endif
 
 #ifndef        NULL

diff --git a/usr/src/include/time.h b/usr/src/include/time.h
index f41084e..a82507f 100644 (file)
--- a/usr/src/include/time.h
+++ b/usr/src/include/time.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)time.h      5.12 (Berkeley) %G%
+ *     @(#)time.h      5.13 (Berkeley) %G%

  */
 
 #ifndef _TIME_H_
  */
 
 #ifndef _TIME_H_


@@ -16,19 +16,19 @@
 #define        NULL    0
 #endif
 
 #define        NULL    0
 #endif
 

-#ifdef _CLOCK_T_
-typedef        _CLOCK_T_       clock_t;
-#undef _CLOCK_T_
+#ifdef _BSD_CLOCK_T_
+typedef        _BSD_CLOCK_T_   clock_t;
+#undef _BSD_CLOCK_T_

 #endif
 
 #endif
 

-#ifdef _TIME_T_
-typedef        _TIME_T_        time_t;
-#undef _TIME_T_
+#ifdef _BSD_TIME_T_
+typedef        _BSD_TIME_T_    time_t;
+#undef _BSD_TIME_T_

 #endif
 
 #endif
 

-#ifdef _SIZE_T_
-typedef        _SIZE_T_        size_t;
-#undef _SIZE_T_
+#ifdef _BSD_SIZE_T_
+typedef        _BSD_SIZE_T_    size_t;
+#undef _BSD_SIZE_T_

 #endif
 
 struct tm {
 #endif
 
 struct tm {

diff --git a/usr/src/sys/hp300/include/ansi.h b/usr/src/sys/hp300/include/ansi.h
index 0f18f01..67d0ce6 100644 (file)
--- a/usr/src/sys/hp300/include/ansi.h
+++ b/usr/src/sys/hp300/include/ansi.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ansi.h      7.2 (Berkeley) %G%
+ *     @(#)ansi.h      7.3 (Berkeley) %G%

  */
 
 #ifndef        _ANSI_H_
  */
 
 #ifndef        _ANSI_H_


@@ -14,19 +14,19 @@
  * Types which are fundamental to the implementation and may appear in
  * more than one standard header are defined here.  Standard headers
  * then use:
  * Types which are fundamental to the implementation and may appear in
  * more than one standard header are defined here.  Standard headers
  * then use:

- *     #ifdef  _SIZE_T_
- *     typedef _SIZE_T_ size_t;
- *     #undef  _SIZE_T_
+ *     #ifdef  _BSD_SIZE_T_
+ *     typedef _BSD_SIZE_T_ size_t;
+ *     #undef  _BSD_SIZE_T_

  *     #endif
  *
  * Thanks, ANSI!
  */
  *     #endif
  *
  * Thanks, ANSI!
  */

-#define        _CLOCK_T_       unsigned long           /* clock() */
-#define        _PTRDIFF_T_     int                     /* ptr1 - ptr2 */
-#define        _SIZE_T_        unsigned int            /* sizeof() */
-#define        _SSIZE_T_       int                     /* byte count or error */
-#define        _TIME_T_        long                    /* time() */
-#define        _VA_LIST_       char *                  /* va_list */
-#define        _WCHAR_T_       unsigned short          /* wchar_t */
+#define        _BSD_CLOCK_T_   unsigned long           /* clock() */
+#define        _BSD_PTRDIFF_T_ int                     /* ptr1 - ptr2 */
+#define        _BSD_SIZE_T_    unsigned int            /* sizeof() */
+#define        _BSD_SSIZE_T_   int                     /* byte count or error */
+#define        _BSD_TIME_T_    long                    /* time() */
+#define        _BSD_VA_LIST_   char *                  /* va_list */
+#define        _BSD_WCHAR_T_   unsigned short          /* wchar_t */

 
 #endif /* _ANSI_H_ */
 
 #endif /* _ANSI_H_ */

diff --git a/usr/src/sys/sys/syslog.h b/usr/src/sys/sys/syslog.h
index 4d13348..1c412e2 100644 (file)
--- a/usr/src/sys/sys/syslog.h
+++ b/usr/src/sys/sys/syslog.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)syslog.h    7.21 (Berkeley) %G%
+ *     @(#)syslog.h    7.22 (Berkeley) %G%

  */
 
 #define        _PATH_LOG       "/dev/log"
  */
 
 #define        _PATH_LOG       "/dev/log"


@@ -153,7 +153,7 @@ void        closelog __P((void));
 void   openlog __P((const char *, int, int));
 int    setlogmask __P((int));
 void   syslog __P((int, const char *, ...));
 void   openlog __P((const char *, int, int));
 int    setlogmask __P((int));
 void   syslog __P((int, const char *, ...));

-void   vsyslog __P((int, const char *, _VA_LIST_));
+void   vsyslog __P((int, const char *, _BSD_VA_LIST_));

 __END_DECLS
 
 #endif /* !KERNEL */
 __END_DECLS
 
 #endif /* !KERNEL */