X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=includes%2Fstddef.h;h=1d5e3afc7ced3b8fe5d6ab20b677f0e88265e200;hb=cd6cfe0f578c4f744ddc9a342243aff6b42f8027;hp=545cef6a0f036269d7de99a94fbdd6157c3b1960;hpb=b335b04edfdff582f5792a57cb9cea8c89584590;p=pdclib.old

diff --git a/includes/stddef.h b/includes/stddef.h
index 545cef6..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,24 +8,31 @@
 
 #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;
-typedef _PDCLIB_size_t    size_t;
+
+#ifndef _PDCLIB_SIZE_T_DEFINED
+#define _PDCLIB_SIZE_T_DEFINED _PDCLIB_SIZE_T_DEFINED
+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