From 7b5210e1be743a1f95774897327caa54c114d057 Mon Sep 17 00:00:00 2001 From: Jakob Kaivo Date: Thu, 21 Apr 2022 20:18:58 -0400 Subject: cleanup and update --- ctype.h | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/ctype.h b/ctype.h index 71c2846..97e4351 100644 --- a/ctype.h +++ b/ctype.h @@ -29,19 +29,6 @@ SOFTWARE. /* TODO: full POSIX tests */ -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 19901L -# if (defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 200112L) -# error POSIX.1-2001 and later require a C99 compiler -# elif (defined _XOPEN_SOURCE && _XOPEN_SOURCE >= 600) -# error XOPEN Issue 6 and later require a C99 compiler -# endif -#endif - -#if (defined _XOPEN_SOURCE) -#define _tolower(__c) tolower(__c) -#define _toupper(__c) toupper(__c) -#endif - int isalnum(int); int isalpha(int); int iscntrl(int); @@ -56,18 +43,12 @@ int isxdigit(int); int tolower(int); int toupper(int); -#if (defined __STDC_VERSION__ && 199901L <= __STDC_VERSION__) +#if (defined __STDC_VERSION__ && 199901L <= __STDC_VERSION__) int isblank(int); #endif -#if (defined _XOPEN_SOURCE) -int isascii(int); -int toascii(int); -#endif - -#if (defined _POSIX_C_SOURCE && 200809L <= _POSIX_C_SOURCE) -/* from */ -typedef int locale_t; +#if (defined _POSIX_C_SOURCE && 200809L <= _POSIX_C_SOURCE) +/* TODO: as in */ typedef int locale_t; int isalnum_l(int, locale_t); int isalpha_l(int, locale_t); @@ -85,4 +66,12 @@ int tolower_l(int, locale_t); int toupper_l(int, locale_t); #endif +#if (defined _XOPEN_SOURCE) +#define _tolower(__c) tolower(__c) +#define _toupper(__c) toupper(__c) + +int isascii(int); +int toascii(int); +#endif + #endif -- cgit v1.2.1