BSD 4_4 release

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

diff --git a/usr/src/include/stddef.h b/usr/src/include/stddef.h
index c81f2bc..70af689 100644 (file)
--- a/usr/src/include/stddef.h
+++ b/usr/src/include/stddef.h
@@ -1,26 +1,56 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)stddef.h    5.4 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)stddef.h    8.1 (Berkeley) 6/2/93

  */
 
 #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_
+#ifndef _ANSI_SOURCE
+typedef        _BSD_WCHAR_T_   rune_t;
+#endif
+typedef        _BSD_WCHAR_T_   wchar_t;
+#undef _BSD_WCHAR_T_

 #endif
 
 #ifndef        NULL
 #endif
 
 #ifndef        NULL