diff options
| author | Sebastian Pop <s.pop@samsung.com> | 2018-12-13 10:04:58 -0600 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2019-01-09 15:41:01 +0100 |
| commit | 10c4c68e5c705a97440c34894ed020fbef708401 (patch) | |
| tree | 4dedb538b607b2307fb140fb2d74b97327e711bb | |
| parent | c534d1ad53e9bc4bb4d2cb91a6843b704c5da599 (diff) | |
| download | Project-Tick-10c4c68e5c705a97440c34894ed020fbef708401.tar.gz Project-Tick-10c4c68e5c705a97440c34894ed020fbef708401.zip | |
remove unused configure check for HAVE_STDARG_H
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | zconf-ng.h.in | 4 | ||||
| -rw-r--r-- | zconf.h.in | 4 |
5 files changed, 1 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eed40c204a..07889e54ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -234,7 +234,6 @@ endif() # Check for unistd.h and stdarg.h # check_include_file(unistd.h Z_HAVE_UNISTD_H) -check_include_file(stdarg.h Z_HAVE_STDARG_H) if(WITH_SANITIZERS AND WITH_MSAN) message(FATAL_ERROR "Memory sanitizer is incompatible with address sanitizer") @@ -564,7 +563,6 @@ macro(generate_cmakein input output) if (_line STREQUAL "#define ZCONF_H") file(APPEND ${output} "#cmakedefine Z_HAVE_UNISTD_H\n") - file(APPEND ${output} "#cmakedefine Z_HAVE_STDARG_H\n") endif() endforeach() endmacro(generate_cmakein) diff --git a/Makefile.in b/Makefile.in index b5dda1b162..958fd8cb7e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -365,7 +365,7 @@ distclean: clean @if [ -f zconf.h.in ]; then \ cp -p $(SRCDIR)/zconf.h.in zconf.h ; \ TEMPFILE=zconfh_$$ ; \ - echo "/#define ZCONF_H/ a\\\n#cmakedefine Z_HAVE_UNISTD_H\\n#cmakedefine Z_HAVE_STDARG_H\n" >> $$TEMPFILE &&\ + echo "/#define ZCONF_H/ a\\\n#cmakedefine Z_HAVE_UNISTD_H\\n" >> $$TEMPFILE &&\ sed -f $$TEMPFILE $(SRCDIR)/zconf.h.in > zconf.h.cmakein &&\ touch -r $(SRCDIR)/zconf.h.in zconf.h.cmakein &&\ rm $$TEMPFILE ; fi @@ -709,19 +709,6 @@ fi echo >> configure.log -# check for stdarg.h and save result in zconf.h -cat > $test.c <<EOF -#include <stdarg.h> -int main() { return 0; } -EOF -if try $CC -c $CFLAGS $test.c; then - sed < zconf${SUFFIX}.h "/^#ifdef HAVE_STDARG_H.* may be/s/def HAVE_STDARG_H\(.*\) may be/ 1\1 was/" > zconf${SUFFIX}.temp.h - mv zconf${SUFFIX}.temp.h zconf${SUFFIX}.h - echo "Checking for stdarg.h... Yes." | tee -a configure.log -else - echo "Checking for stdarg.h... No." | tee -a configure.log -fi - # if --zlib-compat was requested if test $compat -eq 1; then gzfileops=1 diff --git a/zconf-ng.h.in b/zconf-ng.h.in index 73845eed4c..7315025524 100644 --- a/zconf-ng.h.in +++ b/zconf-ng.h.in @@ -111,10 +111,6 @@ typedef void *voidp; # define Z_HAVE_UNISTD_H #endif -#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ -# define Z_HAVE_STDARG_H -#endif - #include <sys/types.h> /* for off_t */ #include <stdarg.h> /* for va_list */ diff --git a/zconf.h.in b/zconf.h.in index 8f741c4653..fd019ba828 100644 --- a/zconf.h.in +++ b/zconf.h.in @@ -111,10 +111,6 @@ typedef void *voidp; # define Z_HAVE_UNISTD_H #endif -#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ -# define Z_HAVE_STDARG_H -#endif - #include <sys/types.h> /* for off_t */ #include <stdarg.h> /* for va_list */ |