From 4e1afcd6625dff04063733c6a8dfc3a8036daf27 Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Tue, 28 Dec 2021 19:19:32 +0100 Subject: [PATCH] Assume STDC_HEADERS will always be defined We're in 2021. C89 is everywhere; in fact, there are many other assumptions in the code that wouldn't probably hold on pre-standard C environments. Let's simplify and assume that C89 is available. The specific assumptions are that: - , and are available - strchr(3), strrchr(3), and strtok(3) are available - isalpha(3), isspace(3), isdigit(3), and isupper(3) are available I think we can safely assume we have all of those. Signed-off-by: Alejandro Colomar --- configure.ac | 1 - lib/defines.h | 12 ++---------- libmisc/getdate.y | 10 ++-------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index c9aa37ab..13cbc8c4 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,6 @@ dnl Checks for libraries. dnl Checks for header files. AC_HEADER_DIRENT -AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_STDBOOL diff --git a/lib/defines.h b/lib/defines.h index fc1521cb..08483940 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -61,16 +61,8 @@ extern char * textdomain (const char * domainname); #endif #endif -#if STDC_HEADERS -# include -# include -#else /* not STDC_HEADERS */ -# ifndef HAVE_STRCHR -# define strchr index -# define strrchr rindex -# endif -char *strchr (), *strrchr (), *strtok (); -#endif /* not STDC_HEADERS */ +#include +#include #if HAVE_ERRNO_H # include diff --git a/libmisc/getdate.y b/libmisc/getdate.y index 7afa995b..9b9f48c2 100644 --- a/libmisc/getdate.y +++ b/libmisc/getdate.y @@ -31,11 +31,7 @@ #include #include -#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) -# define IN_CTYPE_DOMAIN(c) 1 -#else -# define IN_CTYPE_DOMAIN(c) isascii(c) -#endif +#define IN_CTYPE_DOMAIN(c) 1 #define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) #define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c)) @@ -54,9 +50,7 @@ #include "getdate.h" -#if defined (STDC_HEADERS) -# include -#endif +#include /* Some old versions of bison generate parsers that use bcopy. That loses on systems that don't provide the function, so we have