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

diff --git a/includes/stddef.h b/includes/stddef.h
index 8968577..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,15 +6,11 @@
 
 #ifndef _PDCLIB_STDDEF_H
 #define _PDCLIB_STDDEF_H _PDCLIB_STDDEF_H
+#include "_PDCLIB_config.h"
+#include "_PDCLIB_int.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>
+#ifdef __cplusplus
+extern "C" {
 #endif
 
 typedef _PDCLIB_ptrdiff_t ptrdiff_t;
@@ -26,7 +20,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 +34,8 @@ typedef _PDCLIB_wchar_t   wchar_t;
 
 #define offsetof( type, member ) _PDCLIB_offsetof( type, member )
 
+#ifdef __cplusplus
+}
 #endif
 
+#endif