diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-05 10:46:46 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-05 10:46:46 +0200 |
| commit | 9ad5381a2f94073f2d84bdda9bc8892d18587fdd (patch) | |
| tree | 083657dc3332e7c14ccf949d964037fd1cc3d532 /configure.ac | |
| parent | c00816a38fe762777ca0b7dd3035406b51a921b1 (diff) | |
| parent | aa405b7da270595d349d0596ad31305a41d4b1c0 (diff) | |
| download | php-git-9ad5381a2f94073f2d84bdda9bc8892d18587fdd.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix -Wimplicit-function-declaration in configure
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index c843240f9f..2d4ce30825 100644 --- a/configure.ac +++ b/configure.ac @@ -662,6 +662,7 @@ dnl getaddrinfo. AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);]])],[AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include <string.h> #include <netdb.h> #include <sys/types.h> #ifndef AF_INET @@ -674,11 +675,11 @@ int main(void) { hints.ai_flags = AI_NUMERICHOST; if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) { - exit(1); + return 1; } if (ai == 0) { - exit(1); + return 1; } pai = ai; @@ -686,16 +687,16 @@ int main(void) { while (pai) { if (pai->ai_family != AF_INET) { /* 127.0.0.1/NUMERICHOST should only resolve ONE way */ - exit(1); + return 1; } if (pai->ai_addr->sa_family != AF_INET) { /* 127.0.0.1/NUMERICHOST should only resolve ONE way */ - exit(1); + return 1; } pai = pai->ai_next; } freeaddrinfo(ai); - exit(0); + return 0; } ]])],[ac_cv_func_getaddrinfo=yes], [ac_cv_func_getaddrinfo=no], [ac_cv_func_getaddrinfo=no])], [ac_cv_func_getaddrinfo=no])]) |