don't typedef run_t if _ANSI_SOURCE defined
authorKeith Bostic <bostic@ucbvax.Berkeley.EDU>
Sat, 29 May 1993 03:25:01 +0000 (19:25 -0800)
committerKeith Bostic <bostic@ucbvax.Berkeley.EDU>
Sat, 29 May 1993 03:25:01 +0000 (19:25 -0800)
SCCS-vsn: include/stdlib.h 5.28
SCCS-vsn: include/stddef.h 5.8

usr/src/include/stddef.h
usr/src/include/stdlib.h

index 8738cd9..b8ab51e 100644 (file)
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *
- *     @(#)stddef.h    5.7 (Berkeley) %G%
+ *     @(#)stddef.h    5.8 (Berkeley) %G%
  */
 
 #ifndef _STDDEF_H_
  */
 
 #ifndef _STDDEF_H_
@@ -20,8 +20,10 @@ typedef      _BSD_SIZE_T_    size_t;
 #endif
 
 #ifdef _BSD_WCHAR_T_
 #endif
 
 #ifdef _BSD_WCHAR_T_
-typedef        _BSD_WCHAR_T_   wchar_t;
+#ifndef _ANSI_SOURCE
 typedef        _BSD_WCHAR_T_   rune_t;
 typedef        _BSD_WCHAR_T_   rune_t;
+#endif
+typedef        _BSD_WCHAR_T_   wchar_t;
 #undef _BSD_WCHAR_T_
 #endif
 
 #undef _BSD_WCHAR_T_
 #endif
 
index 82db669..b5b027c 100644 (file)
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *
- *     @(#)stdlib.h    5.27 (Berkeley) %G%
+ *     @(#)stdlib.h    5.28 (Berkeley) %G%
  */
 
 #ifndef _STDLIB_H_
  */
 
 #ifndef _STDLIB_H_
@@ -18,7 +18,9 @@ typedef       _BSD_SIZE_T_    size_t;
 #endif
 
 #ifdef _BSD_WCHAR_T_
 #endif
 
 #ifdef _BSD_WCHAR_T_
+#ifndef _ANSI_SOURCE
 typedef        _BSD_WCHAR_T_   rune_t;
 typedef        _BSD_WCHAR_T_   rune_t;
+#endif
 typedef        _BSD_WCHAR_T_   wchar_t;
 #undef _BSD_WCHAR_T_
 #endif
 typedef        _BSD_WCHAR_T_   wchar_t;
 #undef _BSD_WCHAR_T_
 #endif