From 016e34630a0221ab13b0ea3b9007ecbfd21da20e Mon Sep 17 00:00:00 2001 From: michael Date: Mon, 29 Dec 2014 19:38:22 +0000 Subject: [PATCH] - Removed AC_HEADER_STDC configure test git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5207 82007160-df01-0410-b94d-b575c5fd34c7 --- configure | 113 ---------------------------------------- configure.ac | 2 - src/compat.c | 5 +- src/dnsbl.c | 4 -- src/irc.c | 7 +-- src/libopm/configure | 113 ---------------------------------------- src/libopm/configure.ac | 2 - src/libopm/src/compat.c | 5 +- src/libopm/src/config.c | 4 +- src/libopm/src/inet.c | 6 +-- src/libopm/src/proxy.c | 7 +-- src/log.c | 6 +-- src/main.c | 3 -- src/misc.c | 5 +- src/negcache.c | 3 -- src/opercmd.c | 7 +-- src/scan.c | 7 +-- src/stats.c | 5 +- 18 files changed, 16 insertions(+), 288 deletions(-) diff --git a/configure b/configure index cf7deb6..8090e2b 100755 --- a/configure +++ b/configure @@ -12088,119 +12088,6 @@ CC=$lt_save_CC -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - - for ac_header in sys/poll.h do : ac_fn_c_check_header_mongrel "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" diff --git a/configure.ac b/configure.ac index 8c6ecb5..5f33b9d 100644 --- a/configure.ac +++ b/configure.ac @@ -34,8 +34,6 @@ AC_PROG_LIBTOOL dnl Checks for libraries. dnl Checks for header files. -AC_HEADER_STDC - AC_CHECK_HEADERS(sys/poll.h, have_poll_sys_h=yes, have_sys_poll_h=no) AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h strings.h) diff --git a/src/compat.c b/src/compat.c index c2bc98c..a6153c2 100644 --- a/src/compat.c +++ b/src/compat.c @@ -22,10 +22,7 @@ along with this program; if not, write to the #include "setup.h" #include - -#ifdef STDC_HEADERS -# include -#endif +#include #include "compat.h" diff --git a/src/dnsbl.c b/src/dnsbl.c index 75278a0..324b0c2 100644 --- a/src/dnsbl.c +++ b/src/dnsbl.c @@ -23,11 +23,7 @@ along with this program; if not, write to the Free Software #include "setup.h" #include - -#ifdef STDC_HEADERS #include -#endif - #include #include #include diff --git a/src/irc.c b/src/irc.c index 9cf64fd..5588924 100644 --- a/src/irc.c +++ b/src/irc.c @@ -25,11 +25,8 @@ #include #include - -#ifdef STDC_HEADERS -# include -# include -#endif +#include +#include #ifdef HAVE_STRINGS_H # include diff --git a/src/libopm/configure b/src/libopm/configure index 646af32..a3e5bbf 100755 --- a/src/libopm/configure +++ b/src/libopm/configure @@ -12072,119 +12072,6 @@ CC=$lt_save_CC -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - - for ac_header in sys/poll.h do : ac_fn_c_check_header_mongrel "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" diff --git a/src/libopm/configure.ac b/src/libopm/configure.ac index 380d226..7e2752a 100644 --- a/src/libopm/configure.ac +++ b/src/libopm/configure.ac @@ -23,8 +23,6 @@ AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) dnl Checks for header files. -AC_HEADER_STDC - AC_CHECK_HEADERS(sys/poll.h, have_poll_sys_h=yes, have_sys_poll_h=no) AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h strings.h) diff --git a/src/libopm/src/compat.c b/src/libopm/src/compat.c index a433369..fac535b 100644 --- a/src/libopm/src/compat.c +++ b/src/libopm/src/compat.c @@ -22,10 +22,7 @@ #include "setup.h" #include - -#ifdef STDC_HEADERS -# include -#endif +#include #include "compat.h" #include "opm.h" diff --git a/src/libopm/src/config.c b/src/libopm/src/config.c index 12f3fa8..a32b980 100644 --- a/src/libopm/src/config.c +++ b/src/libopm/src/config.c @@ -31,9 +31,7 @@ #include "opm_common.h" #include "list.h" -#ifdef STDC_HEADERS -# include -#endif +#include static OPM_CONFIG_HASH_T HASH[] = { diff --git a/src/libopm/src/inet.c b/src/libopm/src/inet.c index 8c590f8..62add4d 100644 --- a/src/libopm/src/inet.c +++ b/src/libopm/src/inet.c @@ -30,10 +30,8 @@ along with this program; if not, write to #include #include #include -#if STDC_HEADERS -# include -# include -#endif +#include +#include #ifdef HAVE_STRINGS_H # include #endif diff --git a/src/libopm/src/proxy.c b/src/libopm/src/proxy.c index 0d34645..5997e0a 100644 --- a/src/libopm/src/proxy.c +++ b/src/libopm/src/proxy.c @@ -23,11 +23,8 @@ #include "setup.h" #include - -#ifdef STDC_HEADERS -# include -# include -#endif +#include +#include #include "inet.h" #include "compat.h" diff --git a/src/log.c b/src/log.c index 40962e7..64b6536 100644 --- a/src/log.c +++ b/src/log.c @@ -24,19 +24,15 @@ along with this program; if not, write to #include #include - -#ifdef STDC_HEADERS #include #include #include -#endif - #include #include "compat.h" #include "config.h" -#include "extern.h" #include "log.h" +#include "main.h" FILE *logfile; diff --git a/src/main.c b/src/main.c index d09c33b..66260a0 100644 --- a/src/main.c +++ b/src/main.c @@ -33,11 +33,8 @@ along with this program; if not, write to the Free Software #include #include /* getrlimit */ #include - -#ifdef STDC_HEADERS #include #include -#endif #include "compat.h" #include "config.h" diff --git a/src/misc.c b/src/misc.c index 9406889..7a3dc16 100644 --- a/src/misc.c +++ b/src/misc.c @@ -24,10 +24,7 @@ along with this program; if not, write to the Free Software #include #include - -#ifdef STDC_HEADERS -# include -#endif +#include #include "compat.h" #include "config.h" diff --git a/src/negcache.c b/src/negcache.c index 355e4f0..f14cabc 100644 --- a/src/negcache.c +++ b/src/negcache.c @@ -41,10 +41,7 @@ along with this program; if not, write to: #include "setup.h" #include - -#ifdef STDC_HEADERS #include -#endif #ifdef TIME_WITH_SYS_TIME #include diff --git a/src/opercmd.c b/src/opercmd.c index 17e8527..e33a298 100644 --- a/src/opercmd.c +++ b/src/opercmd.c @@ -22,11 +22,8 @@ along with this program; if not, write to the Free Software #include "setup.h" -#ifdef STDC_HEADERS -# include -# include -#endif - +#include +#include #include #include #include diff --git a/src/scan.c b/src/scan.c index a4fc184..50c02f7 100644 --- a/src/scan.c +++ b/src/scan.c @@ -26,11 +26,8 @@ #include #include #include - -#ifdef STDC_HEADERS -# include -# include -#endif +#include +#include #ifdef TIME_WITH_SYS_TIME # include diff --git a/src/stats.c b/src/stats.c index 818ae97..7dcbaa7 100644 --- a/src/stats.c +++ b/src/stats.c @@ -24,10 +24,7 @@ along with this program; if not, write to the Free Software #include #include - -#ifdef STDC_HEADERS -# include -#endif +#include #ifdef HAVE_STRINGS_H # include -- 2.30.2