X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=includes%2Fstddef.h;h=600731bdcacdbea72d0cb9bbaf354c3cfe520e7e;hp=6d8c03a9e466e846cfc4df6e665d177f8a73432f;hb=ea66319bf240c51e4f33caf868e1774e32ef19d6;hpb=b41576197133c1211d6ec353faf93f505f573b8a

diff --git a/includes/stddef.h b/includes/stddef.h
index 6d8c03a..600731b 100644
--- a/includes/stddef.h
+++ b/includes/stddef.h
@@ -1,6 +1,4 @@
-/* $Id$ */
-
-/* 7.17 Common definitions <stddef.h>
+/* Common definitions <stddef.h>
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
@@ -8,9 +6,12 @@
 
 #ifndef _PDCLIB_STDDEF_H
 #define _PDCLIB_STDDEF_H _PDCLIB_STDDEF_H
-#include <_PDCLIB_config.h>
-#include <_PDCLIB_int.h>
-_PDCLIB_BEGIN_EXTERN_C
+#include "_PDCLIB_config.h"
+#include "_PDCLIB_int.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef _PDCLIB_ptrdiff_t ptrdiff_t;
 
@@ -20,8 +21,11 @@ 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
@@ -30,6 +34,8 @@ typedef _PDCLIB_wchar_t   wchar_t;
 
 #define offsetof( type, member ) _PDCLIB_offsetof( type, member )
 
-_PDCLIB_END_EXTERN_C
+#ifdef __cplusplus
+}
 #endif
 
+#endif