From ae66ca64334785fd90835395b58ad0d010226a43 Mon Sep 17 00:00:00 2001 From: Stefan Krah Date: Thu, 22 Nov 2012 22:36:57 +0100 Subject: [PATCH] Issue #13057: Include stdio.h when NULL is used in configure.ac. --- configure | 10 +++++++++- configure.ac | 12 ++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 494bef9e52..40f37de39d 100755 --- a/configure +++ b/configure @@ -5850,6 +5850,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include #include void* routine(void* p){return NULL;} @@ -5905,6 +5906,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include #include void* routine(void* p){return NULL;} @@ -5954,6 +5956,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include #include void* routine(void* p){return NULL;} @@ -6003,6 +6006,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include #include void* routine(void* p){return NULL;} @@ -8690,6 +8694,8 @@ $as_echo "no" >&6; } $as_echo_n "checking for pthread_create in -lpthread... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + +#include #include void * start_routine (void *arg) { exit (0); } @@ -9082,7 +9088,9 @@ else else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include + #include void *foo(void *parm) { return NULL; } diff --git a/configure.ac b/configure.ac index 3d5838e616..20440275dd 100644 --- a/configure.ac +++ b/configure.ac @@ -1233,6 +1233,7 @@ fi AC_MSG_CHECKING(whether pthreads are available without options) AC_CACHE_VAL(ac_cv_pthread_is_default, [AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include #include void* routine(void* p){return NULL;} @@ -1267,6 +1268,7 @@ AC_CACHE_VAL(ac_cv_kpthread, [ac_save_cc="$CC" CC="$CC -Kpthread" AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include #include void* routine(void* p){return NULL;} @@ -1295,6 +1297,7 @@ AC_CACHE_VAL(ac_cv_kthread, [ac_save_cc="$CC" CC="$CC -Kthread" AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include #include void* routine(void* p){return NULL;} @@ -1323,6 +1326,7 @@ AC_CACHE_VAL(ac_cv_thread, [ac_save_cc="$CC" CC="$CC -pthread" AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include #include void* routine(void* p){return NULL;} @@ -2317,7 +2321,9 @@ yes _libs=$LIBS LIBS="$LIBS -lpthread" AC_MSG_CHECKING([for pthread_create in -lpthread]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#include +#include void * start_routine (void *arg) { exit (0); }]], [[ pthread_create (NULL, NULL, start_routine, NULL)]])],[ @@ -2400,7 +2406,9 @@ if test "$posix_threads" = "yes"; then AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported) AC_CACHE_VAL(ac_cv_pthread_system_supported, - [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #include void *foo(void *parm) { return NULL; } -- 2.40.0