X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=includes%2Fstddef.h;h=1d5e3afc7ced3b8fe5d6ab20b677f0e88265e200;hb=2d43dbb1c70aee6c3474c254c0a2302ef39c0c7a;hp=f64a9a109279e70e7e3b02904208e0f3416f19a2;hpb=23e170071520809fd7b2ea3514e48399358362f2;p=pdclib.old

diff --git a/includes/stddef.h b/includes/stddef.h
index f64a9a1..1d5e3af 100644
--- a/includes/stddef.h
+++ b/includes/stddef.h
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* 7.17 Common definitions <stddef.h>
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,16 +8,9 @@
 
 #ifndef _PDCLIB_STDDEF_H
 #define _PDCLIB_STDDEF_H _PDCLIB_STDDEF_H
-
-#ifndef _PDCLIB_CONFIG_H
-#define _PDCLIB_CONFIG_H _PDCLIB_CONFIG_H
 #include <_PDCLIB_config.h>
-#endif
-
-#ifndef _PDCLIB_INT_H
-#define _PDCLIB_INT_H _PDCLIB_INT_H
 #include <_PDCLIB_int.h>
-#endif
+_PDCLIB_BEGIN_EXTERN_C
 
 typedef _PDCLIB_ptrdiff_t ptrdiff_t;
 
@@ -28,11 +19,20 @@ typedef _PDCLIB_ptrdiff_t ptrdiff_t;
 typedef _PDCLIB_size_t size_t;
 #endif
 
+#ifndef __cplusplus
+#ifndef _PDCLIB_WCHAR_T_DEFINED
+#define _PDCLIB_WCHAR_T_DEFINED _PDCLIB_WCHAR_T_DEFINED
 typedef _PDCLIB_wchar_t   wchar_t;
+#endif
+#endif
 
+#ifndef _PDCLIB_NULL_DEFINED
+#define _PDCLIB_NULL_DEFINED _PDCLIB_NULL_DEFINED
 #define NULL _PDCLIB_NULL
+#endif
 
 #define offsetof( type, member ) _PDCLIB_offsetof( type, member )
 
+_PDCLIB_END_EXTERN_C
 #endif