X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=includes%2Fstddef.h;h=d18fcf642a28e36ffe418be5af4529d5efb2617c;hb=0b6ba474c9a13ef218554539106c0a52776ac189;hp=8968577e73f7f7853f13294e86202df5b8afc575;hpb=b08f4b52b1cd1f7a9553c0f357a7c90859fa3e73;p=pdclib

diff --git a/includes/stddef.h b/includes/stddef.h
index 8968577..d18fcf6 100644
--- a/includes/stddef.h
+++ b/includes/stddef.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* 7.17 Common definitions <stddef.h>
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -8,16 +6,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;
 
@@ -26,7 +17,12 @@ 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
@@ -35,5 +31,6 @@ typedef _PDCLIB_wchar_t   wchar_t;
 
 #define offsetof( type, member ) _PDCLIB_offsetof( type, member )
 
+_PDCLIB_END_EXTERN_C
 #endif