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

[unix-history] / usr / src / include / stddef.h

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

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

  */
 
 #ifndef _STDDEF_H_
 #define _STDDEF_H_
  */
 
 #ifndef _STDDEF_H_
 #define _STDDEF_H_

+

 #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