Added size_t to stdlib.h, added redefinition guards, adjusted includes.

diff --git a/functions/stdlib/atoi.c b/functions/stdlib/atoi.c
index 697c77c1117327b896947b0cc9886ee87a384627..5d0a27b7628ac04a50e31b103bef07fbbaa3d657 100644 (file)
--- a/functions/stdlib/atoi.c
+++ b/functions/stdlib/atoi.c
@@ -8,7 +8,6 @@
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#include <_PDCLIB_int.h>
 #include <stdlib.h>
 
 #ifndef REGTEST

diff --git a/functions/stdlib/atol.c b/functions/stdlib/atol.c
index 00b933d7dc0480ac4d44f4b60f857b7854039351..475adef028435ada0088542278beec6bd8fbd7a1 100644 (file)
--- a/functions/stdlib/atol.c
+++ b/functions/stdlib/atol.c
@@ -8,7 +8,6 @@
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#include <_PDCLIB_int.h>
 #include <stdlib.h>
 
 #ifndef REGTEST

diff --git a/functions/stdlib/atoll.c b/functions/stdlib/atoll.c
index 767a4533babf555289e64e244614c5ff4420216b..0f0fe18d20347db8cf5cd6ac730a4797d345cdd1 100644 (file)
--- a/functions/stdlib/atoll.c
+++ b/functions/stdlib/atoll.c
@@ -8,7 +8,6 @@
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#include <_PDCLIB_int.h>
 #include <stdlib.h>
 
 #ifndef REGTEST

diff --git a/functions/stdlib/strtol.c b/functions/stdlib/strtol.c
index 2ee1e5f3fab52aa72af6b963120373569618efa0..7252923f705b373f740d65b59ed56176f32eca34 100644 (file)
--- a/functions/stdlib/strtol.c
+++ b/functions/stdlib/strtol.c
@@ -8,8 +8,6 @@
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#define _PDCLIB_INT_H _PDCLIB_INT_H
-#include <_PDCLIB_int.h>
 #include <limits.h>
 #include <stdlib.h>
 
@@ -37,6 +35,12 @@ long int strtol( const char * s, char ** endptr, int base )
 
 #ifdef TEST
 #include <_PDCLIB_test.h>
+
+#ifndef _PDCLIB_INT_H
+#define _PDCLIB_INT_H
+#include <_PDCLIB_int.h>
+#endif
+
 #include <errno.h>
 
 int main()

diff --git a/functions/stdlib/strtoll.c b/functions/stdlib/strtoll.c
index 21ef1f48783aceaf6de74923a6f968931a1afa41..fbe837d986ed4f51f2823ed9d4916ccf2fc73c14 100644 (file)
--- a/functions/stdlib/strtoll.c
+++ b/functions/stdlib/strtoll.c
@@ -8,8 +8,6 @@
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#define _PDCLIB_INT_H _PDCLIB_INT_H
-#include <_PDCLIB_int.h>
 #include <limits.h>
 #include <stdlib.h>
 
@@ -37,6 +35,12 @@ long long int strtoll( const char * s, char ** endptr, int base )
 
 #ifdef TEST
 #include <_PDCLIB_test.h>
+
+#ifndef _PDCLIB_INT_H
+#define _PDCLIB_INT_H
+#include <_PDCLIB_int.h>
+#endif
+
 #include <errno.h>
 
 int main()

diff --git a/functions/stdlib/strtoul.c b/functions/stdlib/strtoul.c
index 80bacec30aebbb8165d0d146f51fe56c54e8f572..98f5446254a9ff03dfddf553eb056f3d56736163 100644 (file)
--- a/functions/stdlib/strtoul.c
+++ b/functions/stdlib/strtoul.c
@@ -8,8 +8,6 @@
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#define _PDCLIB_INT_H _PDCLIB_INT_H
-#include <_PDCLIB_int.h>
 #include <limits.h>
 #include <stdlib.h>
 

diff --git a/functions/stdlib/strtoull.c b/functions/stdlib/strtoull.c
index de7275a9b58881c92163293c1669e51ea8ae7862..a996c76c62b874ecfcab799c6bcb924919f05bfe 100644 (file)
--- a/functions/stdlib/strtoull.c
+++ b/functions/stdlib/strtoull.c
@@ -8,8 +8,6 @@
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#define _PDCLIB_INT_H _PDCLIB_INT_H
-#include <_PDCLIB_int.h>
 #include <limits.h>
 #include <stdlib.h>
 

diff --git a/includes/stddef.h b/includes/stddef.h
index 545cef6a0f036269d7de99a94fbdd6157c3b1960..f64a9a109279e70e7e3b02904208e0f3416f19a2 100644 (file)
--- a/includes/stddef.h
+++ b/includes/stddef.h
@@ -22,7 +22,12 @@
 #endif
 
 typedef _PDCLIB_ptrdiff_t ptrdiff_t;
-typedef _PDCLIB_size_t    size_t;
+
+#ifndef _PDCLIB_SIZE_T_DEFINED
+#define _PDCLIB_SIZE_T_DEFINED _PDCLIB_SIZE_T_DEFINED
+typedef _PDCLIB_size_t size_t;
+#endif
+
 typedef _PDCLIB_wchar_t   wchar_t;
 
 #define NULL _PDCLIB_NULL

diff --git a/includes/stdlib.h b/includes/stdlib.h
index 6c31a467c83042b45a1184b781c09daceef7458e..e436c6f18d3cfcb795a656e953ad231ead9c3268 100644 (file)
--- a/includes/stdlib.h
+++ b/includes/stdlib.h
@@ -11,20 +11,20 @@
 #ifndef _PDCLIB_STDLIB_H
 #define _PDCLIB_STDLIB_H _PDCLIB_STDLIB_H
 
-#ifndef _PDCLIB_AUX_H
-#define _PDCLIB_AUX_H _PDCLIB_AUX_H
-#include <_PDCLIB_aux.h>
-#endif
-
-#ifndef _PDCLIB_CONFIG_H
-#define _PDCLIB_CONFIG_H _PDCLIB_CONFIG_H
-#include <_PDCLIB_config.h>
+#ifndef _PDCLIB_INT_H
+#define _PDCLIB_INT_H _PDCLIB_INT_H
+#include <_PDCLIB_int.h>
 #endif
 
 typedef struct _PDCLIB_div_t     div_t;
 typedef struct _PDCLIB_ldiv_t   ldiv_t;
 typedef struct _PDCLIB_lldiv_t lldiv_t;
 
+#ifndef _PDCLIB_SIZE_T_DEFINED
+#define _PDCLIB_SIZE_T_DEFINED _PDCLIB_SIZE_T_DEFINED
+typedef _PDCLIB_size_t size_t;
+#endif
+
 #define NULL         _PDCLIB_NULL
 #define EXIT_SUCCESS _PDCLIB_SUCCESS;
 #define EXIT_FAILURE _PDCLIB_FAILURE;

diff --git a/includes/string.h b/includes/string.h
index f6f3e5db701faa522077217897b7eb9c4af1a569..a3a154d7f4c667ac2359d53a14084e4c99fab4bc 100644 (file)
--- a/includes/string.h
+++ b/includes/string.h
@@ -21,7 +21,10 @@
 #include <_PDCLIB_int.h>
 #endif
 
+#ifndef _PDCLIB_SIZE_T_DEFINED
+#define _PDCLIB_SIZE_T_DEFINED _PDCLIB_SIZE_T_DEFINED
 typedef _PDCLIB_size_t size_t;
+#endif
 
 #define NULL _PDCLIB_NULL