File tree Expand file tree Collapse file tree 5 files changed +1
-24
lines changed Expand file tree Collapse file tree 5 files changed +1
-24
lines changed Original file line number Diff line number Diff line change @@ -234,7 +234,6 @@ endif()
234
234
# Check for unistd.h and stdarg.h
235
235
#
236
236
check_include_file (unistd.h Z_HAVE_UNISTD_H )
237
- check_include_file (stdarg.h Z_HAVE_STDARG_H )
238
237
239
238
if (WITH_SANITIZERS AND WITH_MSAN )
240
239
message (FATAL_ERROR "Memory sanitizer is incompatible with address sanitizer" )
@@ -564,7 +563,6 @@ macro(generate_cmakein input output)
564
563
565
564
if (_line STREQUAL "#define ZCONF_H" )
566
565
file (APPEND ${output} "#cmakedefine Z_HAVE_UNISTD_H\n " )
567
- file (APPEND ${output} "#cmakedefine Z_HAVE_STDARG_H\n " )
568
566
endif ()
569
567
endforeach ()
570
568
endmacro (generate_cmakein )
Original file line number Diff line number Diff line change @@ -365,7 +365,7 @@ distclean: clean
365
365
@if [ -f zconf.h.in ]; then \
366
366
cp -p $(SRCDIR)/zconf.h.in zconf.h ; \
367
367
TEMPFILE=zconfh_$$ ; \
368
- echo "/# define ZCONF_H/ a\\\n#cmakedefine Z_HAVE_UNISTD_H\\n#cmakedefine Z_HAVE_STDARG_H\n " >> $$TEMPFILE &&\
368
+ echo "/# define ZCONF_H/ a\\\n#cmakedefine Z_HAVE_UNISTD_H\\n" >> $$TEMPFILE &&\
369
369
sed -f $$TEMPFILE $(SRCDIR)/zconf.h.in > zconf.h.cmakein &&\
370
370
touch -r $(SRCDIR)/zconf.h.in zconf.h.cmakein &&\
371
371
rm $$TEMPFILE ; fi
Original file line number Diff line number Diff line change 709
709
710
710
echo >> configure.log
711
711
712
- # check for stdarg.h and save result in zconf.h
713
- cat > $test .c << EOF
714
- #include <stdarg.h>
715
- int main() { return 0; }
716
- EOF
717
- if try $CC -c $CFLAGS $test .c; then
718
- sed < zconf${SUFFIX} .h " /^#ifdef HAVE_STDARG_H.* may be/s/def HAVE_STDARG_H\(.*\) may be/ 1\1 was/" > zconf${SUFFIX} .temp.h
719
- mv zconf${SUFFIX} .temp.h zconf${SUFFIX} .h
720
- echo " Checking for stdarg.h... Yes." | tee -a configure.log
721
- else
722
- echo " Checking for stdarg.h... No." | tee -a configure.log
723
- fi
724
-
725
712
# if --zlib-compat was requested
726
713
if test $compat -eq 1; then
727
714
gzfileops=1
Original file line number Diff line number Diff line change @@ -111,10 +111,6 @@ typedef void *voidp;
111
111
# define Z_HAVE_UNISTD_H
112
112
#endif
113
113
114
- #ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
115
- # define Z_HAVE_STDARG_H
116
- #endif
117
-
118
114
#include <sys/types.h> /* for off_t */
119
115
#include <stdarg.h> /* for va_list */
120
116
Original file line number Diff line number Diff line change @@ -111,10 +111,6 @@ typedef void *voidp;
111
111
# define Z_HAVE_UNISTD_H
112
112
#endif
113
113
114
- #ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
115
- # define Z_HAVE_STDARG_H
116
- #endif
117
-
118
114
#include <sys/types.h> /* for off_t */
119
115
#include <stdarg.h> /* for va_list */
120
116
You can’t perform that action at this time.
0 commit comments