X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=includes%2Fstring.h;h=55b94f9a0c47a4b7b4ca10bff878210683479586;hb=33ea80a48bfc48263e3cc855e7a4bfef7ebe8d98;hp=c6ebcd37733bdf22b13401153cb89900e616b4ab;hpb=70f1c6f7c9d515ef426da68973511f46de57005a;p=pdclib

diff --git a/includes/string.h b/includes/string.h
index c6ebcd3..55b94f9 100644
--- a/includes/string.h
+++ b/includes/string.h
@@ -10,17 +10,17 @@
 #ifndef __STRING_H
 #define __STRING_H __STRING_H
 
-// TODO: Documentation, C++ handling
+// TODO: Documentation
 
 // ----------------------------------------------------------------------------
 // MACROS
 
-#define NULL 0
+#include "__NULL.h"
 
 // ----------------------------------------------------------------------------
 // TYPEDEFS
 
-typedef size_t; // TODO - personality?
+#include "__size_t.h"
 
 // ----------------------------------------------------------------------------
 // FUNCTIONS
@@ -43,27 +43,10 @@ size_t strspn( const char * s1, const char * s2 );
 char * strtok( char * restrict s1, const char * restrict s2 );
 size_t strxfrm( char * restrict s1, const char * restrict s2, size_t n );
 
-#ifdef __cplusplus
-
-const void * memchr( const void * s, int c, size_t n );
-void * memchr( void * s, int c, size_t n );
-const char * strchr( const char * s, int c );
-char * strchr( char * s, int c );
-const char * strpbrk( const char * s1, const char * s2 );
-char * strpbrk( char * s1, const char * s2 );
-const char * strrchr( const char * s, int c );
-char * strrchr( char * s, int c );
-const char * strstr( const char * s1, const char * s2 );
-char * strstr( char * s1, const char * s2 );
-
-#else
-
 void * memchr( const void * s, int c, size_t n );
 char * strchr( const char * s, int c );
 char * strpbrk( const char *s1, const char * s2 );
 char * strrchr( const char * s, int c );
 char * strstr( const char * s1, const char * s2 );
 
-#endif // __cplusplus
-
 #endif // __STRING_H