X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=includes%2Fwchar.h;h=2af21556aa7a38b2ac5541206002f93bb103a90d;hb=8c8750c2826684c2420571a8007b9606f72c9040;hp=300b0f04c1ed88bcb524e41e3b008822be129ed2;hpb=70f1c6f7c9d515ef426da68973511f46de57005a;p=pdclib

diff --git a/includes/wchar.h b/includes/wchar.h
index 300b0f0..2af2155 100644
--- a/includes/wchar.h
+++ b/includes/wchar.h
@@ -10,27 +10,27 @@
 #ifndef __WCHAR_H
 #define __WCHAR_H __WCHAR_H
 
-// TODO: Documentation, C++ handling
+// TODO: Documentation
 
 // ----------------------------------------------------------------------------
 // MACROS
 
-#define NULL       0
-#define WCHAR_MAX  // TODO - personality?
-#define WCHAR_MIN  // TODO - personality?
+#include "__NULL.h"
+#include "__WCHAR.h"
+
 #define WEOF       // TODO - personality?
 
 // ----------------------------------------------------------------------------
 // TYPEDEFS
 
+#include "__tm.h"
+#include "__size_t.h"
+#include "__wchar_t.h"
+#include "__wint_t.h"
+
 typedef mbstate_t; // TODO - personality?
 typedef size_t;    // TODO - personality?
 typedef wint_t;    // TODO - personality?
-struct tm;         // TODO - personality?
-
-#ifndef __cplusplus
-typedef wchar_t;   // TODO - personality?
-#endif // __cplusplus
 
 // ----------------------------------------------------------------------------
 // FUNCTIONS
@@ -95,27 +95,10 @@ wchar_t * wmemcpy( wchar_t * restrict s1, const wchar_t * restrict s2, size_t n
 wchar_t * wmemmove( wchar_t * s1, const wchar_t * s2, size_t n );
 wchar_t * wmemset( wchar_t * s, wchar_t c, size_t n );
 
-#ifdef __cplusplus
-
-const wchar_t * wcschr( const wchar_t * s, wchar_t c );
-wchar_t * wcschr( wchar_t * s, wchar_t c );
-const wchar_t * wcspbrk( const wchar_t * s1, const wchar_t * s2 );
-wchar_t * wcspbrk( wchar_t * s1, const wchar_t * s2 );
-const wchar_t * wcsrchr( const wchar_t * s, wchar_t c );
-wchar_t * wcsrchr( wchar_t * s, wchar_t c );
-const wchar_t * wcsstr( const wchar_t * s1, const wchar_t * s2 );
-wchar_t * wcsstr( wchar_t * s1, const wchar_t * s2 );
-const wchar_t * wmemchr( const wchar_t * s, wchar_t c, size_t n );
-wchar_t * wmemchr( wchar_t * s, wchar_t c, size_t n );
-
-#else
-
 wchar_t * wcschr( const wchar_t * s, wchar_t c ); 
 wchar_t * wcspbrk( const wchar_t * s1, const wchar_t * s2 );
 wchar_t * wcsrchr( const wchar_t * s, wchar_t c );
 wchar_t * wcsstr( const wchar_t * s1, const wchar_t * s2 );
 wchar_t * wmemchr( const wchar_t * s, wchar_t c, size_t n);
 
-#endif // __cplusplus
-
 #endif // __WCHAR_H