From f2ae864016340aed35270502aedbad6da9e6f1bf Mon Sep 17 00:00:00 2001 From: Jun-ichi Takimoto Date: Mon, 16 Nov 2020 20:59:51 +0900 Subject: 47560: add includes/prototypes for tests in configure On macOS 11.0 it is now an error to use a function without prototype. (cherry picked from commit bd647c156549b2f666e5fae80f1ca674b6cde895) --- ChangeLog | 4 ++++ aczsh.m4 | 6 ++++++ configure.ac | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/ChangeLog b/ChangeLog index 680fbaf3b..b7721e856 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2022-01-27 dana + * Jun-ichi Takimoto: 47560: configure.ac, aczsh.m4: add necessary + includes or prototypes for the tests in configure (fix errors in + macOS 11) + * unposted: Completion/Unix/Command/_git: Fix copy/paste error in earlier commit that broke `git stash drop` diff --git a/aczsh.m4 b/aczsh.m4 index 0219ae2fb..1200ace38 100644 --- a/aczsh.m4 +++ b/aczsh.m4 @@ -118,6 +118,7 @@ AC_TRY_COMMAND($DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS AC_TRY_COMMAND($CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&AC_FD_CC) && AC_TRY_COMMAND($DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&AC_FD_CC); then AC_TRY_RUN([ +#include #ifdef HPUX10DYNAMIC #include #define RTLD_LAZY BIND_DEFERRED @@ -199,6 +200,7 @@ AC_TRY_COMMAND($DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS AC_TRY_COMMAND($CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&AC_FD_CC) && AC_TRY_COMMAND($DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&AC_FD_CC); then AC_TRY_RUN([ +#include #ifdef HPUX10DYNAMIC #include #define RTLD_LAZY BIND_DEFERRED @@ -274,6 +276,7 @@ AC_TRY_COMMAND($DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS AC_TRY_COMMAND($CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&AC_FD_CC) && AC_TRY_COMMAND($DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&AC_FD_CC); then AC_TRY_RUN([ +#include #ifdef HPUX10DYNAMIC #include #define RTLD_LAZY BIND_DEFERRED @@ -343,6 +346,7 @@ AC_TRY_COMMAND($DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS save_ldflags=$LDFLAGS LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" AC_TRY_RUN([ +#include #ifdef HPUX10DYNAMIC #include #define RTLD_LAZY BIND_DEFERRED @@ -416,6 +420,7 @@ elif save_ldflags=$LDFLAGS LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS -s" AC_TRY_RUN([ +#include #ifdef HPUX10DYNAMIC #include #define RTLD_LAZY BIND_DEFERRED @@ -483,6 +488,7 @@ echo 'int fred () { return 42; }' > conftest1.c if AC_TRY_COMMAND($CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest1.c 1>&AC_FD_CC) && AC_TRY_COMMAND($DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS -s conftest1.o $LIBS 1>&AC_FD_CC); then AC_TRY_RUN([ +#include #ifdef HPUX10DYNAMIC #include #define RTLD_LAZY BIND_DEFERRED diff --git a/configure.ac b/configure.ac index f2d65ecfc..af8c5bba8 100644 --- a/configure.ac +++ b/configure.ac @@ -1394,6 +1394,10 @@ AH_TEMPLATE([TGETENT_ACCEPTS_NULL], AC_CACHE_CHECK(if tgetent accepts NULL, zsh_cv_func_tgetent_accepts_null, [AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include +#include +int tgetent(char *, char *); +char *tgetstr(char *, char **); main() { char buf[4096]; @@ -1418,6 +1422,10 @@ fi AC_CACHE_CHECK(if tgetent returns 0 on success, zsh_cv_func_tgetent_zero_success, [AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include +#include +int tgetent(char *, char*); +char *tgetstr(char *, char **); main() { char buf[4096]; @@ -1855,6 +1863,7 @@ zsh_cv_rlim_t_is_longer, #include #endif #include +#include main(){struct rlimit r;exit(sizeof(r.rlim_cur) <= sizeof(long));}]])],[zsh_cv_rlim_t_is_longer=yes],[zsh_cv_rlim_t_is_longer=no],[zsh_cv_rlim_t_is_longer=yes])]) if test x$zsh_cv_rlim_t_is_longer = xyes; then AC_CACHE_CHECK(if rlim_t is a quad, @@ -1865,6 +1874,7 @@ if test x$zsh_cv_rlim_t_is_longer = xyes; then #endif #include #include +#include main() { struct rlimit r; char buf[20]; @@ -1887,6 +1897,7 @@ else #include #endif #include +#include main(){struct rlimit r;r.rlim_cur=-1;exit(r.rlim_cur<0);}]])],[zsh_cv_type_rlim_t_is_unsigned=yes],[zsh_cv_type_rlim_t_is_unsigned=no],[zsh_cv_type_rlim_t_is_unsigned=no])]) if test x$zsh_cv_type_rlim_t_is_unsigned = xyes; then AC_DEFINE(RLIM_T_IS_UNSIGNED) @@ -2258,6 +2269,9 @@ zsh_cv_sys_fifo, [AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include +#include +#include +#include main() { char c; @@ -2299,6 +2313,7 @@ zsh_cv_sys_link, [AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include +#include main() { int ret; @@ -2331,6 +2346,7 @@ zsh_cv_sys_killesrch, #include #include #include +#include main() { int pid = (getpid() + 10000) & 0xffffff; @@ -2356,6 +2372,7 @@ if test x$signals_style = xPOSIX_SIGNALS; then [AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include +#include int child=0; void handler(sig) int sig; @@ -2407,6 +2424,7 @@ case "x$zsh_working_tcsetpgrp" in #include #include #include +#include main() { int fd; int ret; @@ -2450,6 +2468,10 @@ if test x$ac_cv_func_getpwnam = xyes; then zsh_cv_sys_getpwnam_faked, [AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include +#include +#include +#include +#include main() { struct passwd *pw1, *pw2; char buf[1024], name[1024]; @@ -2777,6 +2799,7 @@ elif test "x$dynamic" = xyes; then [AC_RUN_IFELSE([AC_LANG_SOURCE([[/* Test for whether ELF binaries are produced */ #include #include +#include main(argc, argv) int argc; char *argv[]; @@ -2930,6 +2953,7 @@ EOM AC_TRY_COMMAND($DLLD $LDFLAGS $DLLDFLAGS -o conftest.$DL_EXT conftest.o 1>&AS_MESSAGE_LOG_FD) && AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include +#include #ifdef HPUX10DYNAMIC #include #define RTLD_LAZY BIND_DEFERRED -- cgit 1.4.1