Merged branch stdio_rewrite back into trunk.

[pdclib] / includes / string.h

diff --git a/includes/string.h b/includes/string.h
index a3a154d7f4c667ac2359d53a14084e4c99fab4bc..2aa7aaedb41206750ca1beac9a1c252b1e9c3fe5 100644 (file)
--- a/includes/string.h
+++ b/includes/string.h
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* String handling <string.h>
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -11,11 +9,6 @@
 #ifndef _PDCLIB_STRING_H
 #define _PDCLIB_STRING_H _PDCLIB_STRING_H
 
-#ifndef _PDCLIB_AUX_H
-#define _PDCLIB_AUX_H _PDCLIB_AUX_H
-#include <_PDCLIB_aux.h>
-#endif
-
 #ifndef _PDCLIB_INT_H
 #define _PDCLIB_INT_H _PDCLIB_INT_H
 #include <_PDCLIB_int.h>
@@ -26,7 +19,10 @@
 typedef _PDCLIB_size_t size_t;
 #endif
 
+#ifndef _PDCLIB_NULL_DEFINED
+#define _PDCLIB_NULL_DEFINED _PDCLIB_NULL_DEFINED
 #define NULL _PDCLIB_NULL
+#endif
 
 /* String function conventions */