Libc-339.tar.gz

[apple/libc.git] / include / stddef.h

diff --git a/include/stddef.h b/include/stddef.h
index 6835ac54463ce57b4e2e2bd43fecc71bbc1bae76..d58d336ec375f22b9225b568734076378c97b845 100644 (file)
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -60,32 +63,32 @@
 #ifndef __STDDEF_H__
 #define __STDDEF_H__
 
-#include <machine/types.h>
-#include <machine/ansi.h>
+#include <_types.h>
 
-typedef        _BSD_PTRDIFF_T_ ptrdiff_t;
+#ifndef _PTRDIFF_T_DECLARED
+typedef        __osx_ptrdiff_t ptrdiff_t;
+#define _PTRDIFF_T_DECLARED
+#endif
 
 #ifndef        _BSD_SIZE_T_DEFINED_
 #define        _BSD_SIZE_T_DEFINED_
-typedef        _BSD_SIZE_T_    size_t;
-#endif
-
-#if !defined(_ANSI_SOURCE)
-#ifndef _BSD_RUNE_T_DEFINED_
-#define _BSD_RUNE_T_DEFINED_
-typedef _BSD_RUNE_T_    rune_t;
-#endif
+typedef        __osx_size_t    size_t;
 #endif
 
+#ifndef        __cplusplus
 #ifndef        _BSD_WCHAR_T_DEFINED_
 #define        _BSD_WCHAR_T_DEFINED_
-typedef        _BSD_WCHAR_T_   wchar_t;
-#endif
+typedef        __osx_wchar_t   wchar_t;
+#endif /* _BSD_WCHAR_T_DEFINED_ */
+#endif /* __cplusplus */
 
-#ifndef        NULL
-#define        NULL    0
-#endif
+#ifndef NULL
+#define NULL __OSX_NULL
+#endif /* ! NULL */
 
-#define         offsetof(type, member)  __offsetof(type, member)
+#ifndef __offsetof     /* Deprecated: for source compatability only */
+#define __offsetof(type, field) ((size_t)(&((type *)0)->field))
+#endif
+#define offsetof(type, field) ((size_t)(&((type *)0)->field))
 
 #endif /* __STDDEF_H__ */