diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-05 10:43:58 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-05 10:43:58 +0200 |
| commit | aa405b7da270595d349d0596ad31305a41d4b1c0 (patch) | |
| tree | 20800891a990c064250ccf40b63c66c4e7de0c57 /ext | |
| parent | bf6873a18e3b6b00f82a645c0893a281ae8eadb8 (diff) | |
| download | php-git-aa405b7da270595d349d0596ad31305a41d4b1c0.tar.gz | |
Fix -Wimplicit-function-declaration in configure
As this is an error with xcode 12, see bug #80171.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/config.m4 | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 6c508e30df..5637d374db 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -7,6 +7,8 @@ AC_CACHE_CHECK([whether flush should be called explicitly after a buffered io], AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <stdio.h> #include <stdlib.h> +#include <string.h> +#include <unistd.h> int main(int argc, char **argv) { @@ -61,6 +63,8 @@ fi AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[ AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include <string.h> + #if HAVE_UNISTD_H #include <unistd.h> #endif @@ -72,9 +76,9 @@ AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[ int main() { #if HAVE_CRYPT char *encrypted = crypt("rasmuslerdorf","rl"); - exit(!encrypted || strcmp(encrypted,"rl.3StKT.4T8M")); + return !encrypted || strcmp(encrypted,"rl.3StKT.4T8M"); #else - exit(1); + return 1; #endif }]])],[ ac_cv_crypt_des=yes @@ -86,6 +90,8 @@ int main() { AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[ AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include <string.h> + #if HAVE_UNISTD_H #include <unistd.h> #endif @@ -97,9 +103,9 @@ AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[ int main() { #if HAVE_CRYPT char *encrypted = crypt("rasmuslerdorf","_J9..rasm"); - exit(!encrypted || strcmp(encrypted,"_J9..rasmBYk8r9AiWNc")); + return !encrypted || strcmp(encrypted,"_J9..rasmBYk8r9AiWNc"); #else - exit(1); + return 1; #endif }]])],[ ac_cv_crypt_ext_des=yes @@ -111,6 +117,8 @@ int main() { AC_CACHE_CHECK(for MD5 crypt, ac_cv_crypt_md5,[ AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include <string.h> + #if HAVE_UNISTD_H #include <unistd.h> #endif @@ -132,9 +140,9 @@ int main() { strcpy(answer,salt); strcat(answer,"rISCgZzpwk3UhDidwXvin0"); encrypted = crypt("rasmuslerdorf",salt); - exit(!encrypted || strcmp(encrypted,answer)); + return !encrypted || strcmp(encrypted,answer); #else - exit(1); + return 1; #endif }]])],[ ac_cv_crypt_md5=yes @@ -146,6 +154,8 @@ int main() { AC_CACHE_CHECK(for Blowfish crypt, ac_cv_crypt_blowfish,[ AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include <string.h> + #if HAVE_UNISTD_H #include <unistd.h> #endif @@ -164,9 +174,9 @@ int main() { strcpy(answer,salt); strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra"); encrypted = crypt("rasmuslerdorf",salt); - exit(!encrypted || strcmp(encrypted,answer)); + return !encrypted || strcmp(encrypted,answer); #else - exit(1); + return 1; #endif }]])],[ ac_cv_crypt_blowfish=yes @@ -178,6 +188,8 @@ int main() { AC_CACHE_CHECK(for SHA512 crypt, ac_cv_crypt_sha512,[ AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include <string.h> + #if HAVE_UNISTD_H #include <unistd.h> #endif @@ -195,9 +207,9 @@ int main() { strcpy(answer, salt); strcat(answer, "EeHCRjm0bljalWuALHSTs1NB9ipEiLEXLhYeXdOpx22gmlmVejnVXFhd84cEKbYxCo.XuUTrW.RLraeEnsvWs/"); encrypted = crypt("rasmuslerdorf",salt); - exit(!encrypted || strcmp(encrypted,answer)); + return !encrypted || strcmp(encrypted,answer); #else - exit(1); + return 1; #endif }]])],[ ac_cv_crypt_sha512=yes @@ -209,6 +221,8 @@ int main() { AC_CACHE_CHECK(for SHA256 crypt, ac_cv_crypt_sha256,[ AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include <string.h> + #if HAVE_UNISTD_H #include <unistd.h> #endif @@ -226,9 +240,9 @@ int main() { strcpy(answer, salt); strcat(answer, "cFAm2puLCujQ9t.0CxiFIIvFi4JyQx5UncCt/xRIX23"); encrypted = crypt("rasmuslerdorf",salt); - exit(!encrypted || strcmp(encrypted,answer)); + return !encrypted || strcmp(encrypted,answer); #else - exit(1); + return 1; #endif }]])],[ ac_cv_crypt_sha256=yes |