From aa980e7f23430161549089ab9661f07d9db116c4 Mon Sep 17 00:00:00 2001 From: solar Date: Thu, 15 Dec 2005 13:23:52 +0000 Subject: [PATCH] Added size_t to stdlib.h, added redefinition guards, adjusted includes. --- functions/stdlib/atoi.c | 1 - functions/stdlib/atol.c | 1 - functions/stdlib/atoll.c | 1 - functions/stdlib/strtol.c | 8 ++++++-- functions/stdlib/strtoll.c | 8 ++++++-- functions/stdlib/strtoul.c | 2 -- functions/stdlib/strtoull.c | 2 -- includes/stddef.h | 7 ++++++- includes/stdlib.h | 16 ++++++++-------- includes/string.h | 3 +++ 10 files changed, 29 insertions(+), 20 deletions(-) diff --git a/functions/stdlib/atoi.c b/functions/stdlib/atoi.c index 697c77c..5d0a27b 100644 --- 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 #ifndef REGTEST diff --git a/functions/stdlib/atol.c b/functions/stdlib/atol.c index 00b933d..475adef 100644 --- 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 #ifndef REGTEST diff --git a/functions/stdlib/atoll.c b/functions/stdlib/atoll.c index 767a453..0f0fe18 100644 --- 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 #ifndef REGTEST diff --git a/functions/stdlib/strtol.c b/functions/stdlib/strtol.c index 2ee1e5f..7252923 100644 --- 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 #include @@ -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 int main() diff --git a/functions/stdlib/strtoll.c b/functions/stdlib/strtoll.c index 21ef1f4..fbe837d 100644 --- 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 #include @@ -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 int main() diff --git a/functions/stdlib/strtoul.c b/functions/stdlib/strtoul.c index 80bacec..98f5446 100644 --- 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 #include diff --git a/functions/stdlib/strtoull.c b/functions/stdlib/strtoull.c index de7275a..a996c76 100644 --- 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 #include diff --git a/includes/stddef.h b/includes/stddef.h index 545cef6..f64a9a1 100644 --- 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 6c31a46..e436c6f 100644 --- 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 f6f3e5d..a3a154d 100644 --- 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 -- 2.40.0