Skip to content

Commit aa405b7

Browse files
committed
Fix -Wimplicit-function-declaration in configure
As this is an error with xcode 12, see bug #80171.
1 parent bf6873a commit aa405b7

File tree

5 files changed

+61
-40
lines changed

5 files changed

+61
-40
lines changed

Zend/Zend.m4

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,16 @@ int main()
116116
double d = (double) LONG_MIN * LONG_MIN + 2e9;
117117
118118
if ((long) d == 2e9 && (long) -d == -2e9) {
119-
exit(0);
119+
return 0;
120120
}
121121
} else if (sizeof(long) == 8) {
122122
double correct = 18e18 - ((double) LONG_MIN * -2); /* Subtract ULONG_MAX + 1 */
123123
124124
if ((long) 18e18 == correct) { /* On 64-bit, only check between LONG_MAX and ULONG_MAX */
125-
exit(0);
125+
return 0;
126126
}
127127
}
128-
exit(1);
128+
return 1;
129129
}
130130
]])], [
131131
AC_DEFINE([ZEND_DVAL_TO_LVAL_CAST_OK], 1, [Define if double cast to long preserves least significant bits])
@@ -249,7 +249,7 @@ int main()
249249
fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);
250250
fclose(fp);
251251
252-
exit(0);
252+
return 0;
253253
}
254254
]])], [
255255
LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
@@ -318,6 +318,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
318318
#include <sys/mman.h>
319319
#include <stdlib.h>
320320
#include <stdio.h>
321+
#include <unistd.h>
321322
#ifndef MAP_ANON
322323
# ifdef MAP_ANONYMOUS
323324
# define MAP_ANON MAP_ANONYMOUS

Zend/acinclude.m4

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ dnl Check for broken sprintf()
6363
dnl
6464
AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
6565
AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
66-
AC_RUN_IFELSE([AC_LANG_SOURCE([[main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }]])],[
66+
AC_RUN_IFELSE([AC_LANG_SOURCE([[
67+
#include <stdio.h>
68+
int main() {char buf[20]; return sprintf(buf,"testing 123")!=11; }
69+
]])],[
6770
ac_cv_broken_sprintf=no
6871
],[
6972
ac_cv_broken_sprintf=yes

acinclude.m4

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,14 +1209,14 @@ AC_DEFUN([PHP_DOES_PWRITE_WORK],[
12091209
#include <unistd.h>
12101210
#include <errno.h>
12111211
$1
1212-
main() {
1212+
int main() {
12131213
int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600);
12141214
1215-
if (fd < 0) exit(1);
1216-
if (pwrite(fd, "text", 4, 0) != 4) exit(1);
1215+
if (fd < 0) return 1;
1216+
if (pwrite(fd, "text", 4, 0) != 4) return 1;
12171217
/* Linux glibc breakage until 2.2.5 */
1218-
if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1);
1219-
exit(0);
1218+
if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) return 1;
1219+
return 0;
12201220
}
12211221
12221222
]])],[
@@ -1239,14 +1239,14 @@ AC_DEFUN([PHP_DOES_PREAD_WORK],[
12391239
#include <unistd.h>
12401240
#include <errno.h>
12411241
$1
1242-
main() {
1242+
int main() {
12431243
char buf[3];
12441244
int fd = open("conftest_in", O_RDONLY);
1245-
if (fd < 0) exit(1);
1246-
if (pread(fd, buf, 2, 0) != 2) exit(1);
1245+
if (fd < 0) return 1;
1246+
if (pread(fd, buf, 2, 0) != 2) return 1;
12471247
/* Linux glibc breakage until 2.2.5 */
1248-
if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1);
1249-
exit(0);
1248+
if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) return 1;
1249+
return 0;
12501250
}
12511251
]])],[
12521252
ac_cv_pread=yes
@@ -1347,25 +1347,26 @@ AC_DEFUN([PHP_READDIR_R_TYPE],[
13471347
#define _REENTRANT
13481348
#include <sys/types.h>
13491349
#include <dirent.h>
1350+
#include <unistd.h>
13501351
13511352
#ifndef PATH_MAX
13521353
#define PATH_MAX 1024
13531354
#endif
13541355
1355-
main() {
1356+
int main() {
13561357
DIR *dir;
13571358
char entry[sizeof(struct dirent)+PATH_MAX];
13581359
struct dirent *pentry = (struct dirent *) &entry;
13591360
13601361
dir = opendir("/");
13611362
if (!dir)
1362-
exit(1);
1363+
return 1;
13631364
if (readdir_r(dir, (struct dirent *) entry, &pentry) == 0) {
13641365
close(dir);
1365-
exit(0);
1366+
return 0;
13661367
}
13671368
close(dir);
1368-
exit(1);
1369+
return 1;
13691370
}
13701371
]])],[
13711372
ac_cv_what_readdir_r=POSIX
@@ -1693,6 +1694,7 @@ AC_DEFUN([PHP_BROKEN_GLIBC_FOPEN_APPEND], [
16931694
AC_CACHE_VAL(_cv_have_broken_glibc_fopen_append,[
16941695
AC_RUN_IFELSE([AC_LANG_SOURCE([[
16951696
#include <stdio.h>
1697+
#include <unistd.h>
16961698
int main(int argc, char *argv[])
16971699
{
16981700
FILE *fp;
@@ -1702,7 +1704,7 @@ int main(int argc, char *argv[])
17021704
fp = fopen(filename, "w");
17031705
if (fp == NULL) {
17041706
perror("fopen");
1705-
exit(2);
1707+
return 2;
17061708
}
17071709
fputs("foobar", fp);
17081710
fclose(fp);
@@ -1812,13 +1814,13 @@ int seeker(void *cookie, __off64_t *position, int whence)
18121814
18131815
cookie_io_functions_t funcs = {reader, writer, seeker, closer};
18141816
1815-
main() {
1817+
int main() {
18161818
struct cookiedata g = { 0 };
18171819
FILE *fp = fopencookie(&g, "r", funcs);
18181820
18191821
if (fp && fseek(fp, 8192, SEEK_SET) == 0 && g.pos == 8192)
1820-
exit(0);
1821-
exit(1);
1822+
return 0;
1823+
return 1;
18221824
}
18231825
18241826
]])], [

configure.ac

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -716,6 +716,7 @@ dnl Also check for working getaddrinfo
716716
AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo,
717717
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],
718718
[[struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);]])],[AC_RUN_IFELSE([AC_LANG_SOURCE([[
719+
#include <string.h>
719720
#include <netdb.h>
720721
#include <sys/types.h>
721722
#ifndef AF_INET
@@ -728,28 +729,28 @@ int main(void) {
728729
hints.ai_flags = AI_NUMERICHOST;
729730
730731
if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) {
731-
exit(1);
732+
return 1;
732733
}
733734
734735
if (ai == 0) {
735-
exit(1);
736+
return 1;
736737
}
737738
738739
pai = ai;
739740
740741
while (pai) {
741742
if (pai->ai_family != AF_INET) {
742743
/* 127.0.0.1/NUMERICHOST should only resolve ONE way */
743-
exit(1);
744+
return 1;
744745
}
745746
if (pai->ai_addr->sa_family != AF_INET) {
746747
/* 127.0.0.1/NUMERICHOST should only resolve ONE way */
747-
exit(1);
748+
return 1;
748749
}
749750
pai = pai->ai_next;
750751
}
751752
freeaddrinfo(ai);
752-
exit(0);
753+
return 0;
753754
}
754755
]])],[ac_cv_func_getaddrinfo=yes], [ac_cv_func_getaddrinfo=no], [ac_cv_func_getaddrinfo=no])],
755756
[ac_cv_func_getaddrinfo=no])])

ext/standard/config.m4

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ AC_CACHE_CHECK([whether flush should be called explicitly after a buffered io],
77
AC_RUN_IFELSE([AC_LANG_SOURCE([[
88
#include <stdio.h>
99
#include <stdlib.h>
10+
#include <string.h>
11+
#include <unistd.h>
1012
1113
int main(int argc, char **argv)
1214
{
@@ -61,6 +63,8 @@ fi
6163

6264
AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
6365
AC_RUN_IFELSE([AC_LANG_SOURCE([[
66+
#include <string.h>
67+
6468
#if HAVE_UNISTD_H
6569
#include <unistd.h>
6670
#endif
@@ -72,9 +76,9 @@ AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
7276
int main() {
7377
#if HAVE_CRYPT
7478
char *encrypted = crypt("rasmuslerdorf","rl");
75-
exit(!encrypted || strcmp(encrypted,"rl.3StKT.4T8M"));
79+
return !encrypted || strcmp(encrypted,"rl.3StKT.4T8M");
7680
#else
77-
exit(1);
81+
return 1;
7882
#endif
7983
}]])],[
8084
ac_cv_crypt_des=yes
@@ -86,6 +90,8 @@ int main() {
8690

8791
AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[
8892
AC_RUN_IFELSE([AC_LANG_SOURCE([[
93+
#include <string.h>
94+
8995
#if HAVE_UNISTD_H
9096
#include <unistd.h>
9197
#endif
@@ -97,9 +103,9 @@ AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[
97103
int main() {
98104
#if HAVE_CRYPT
99105
char *encrypted = crypt("rasmuslerdorf","_J9..rasm");
100-
exit(!encrypted || strcmp(encrypted,"_J9..rasmBYk8r9AiWNc"));
106+
return !encrypted || strcmp(encrypted,"_J9..rasmBYk8r9AiWNc");
101107
#else
102-
exit(1);
108+
return 1;
103109
#endif
104110
}]])],[
105111
ac_cv_crypt_ext_des=yes
@@ -111,6 +117,8 @@ int main() {
111117

112118
AC_CACHE_CHECK(for MD5 crypt, ac_cv_crypt_md5,[
113119
AC_RUN_IFELSE([AC_LANG_SOURCE([[
120+
#include <string.h>
121+
114122
#if HAVE_UNISTD_H
115123
#include <unistd.h>
116124
#endif
@@ -132,9 +140,9 @@ int main() {
132140
strcpy(answer,salt);
133141
strcat(answer,"rISCgZzpwk3UhDidwXvin0");
134142
encrypted = crypt("rasmuslerdorf",salt);
135-
exit(!encrypted || strcmp(encrypted,answer));
143+
return !encrypted || strcmp(encrypted,answer);
136144
#else
137-
exit(1);
145+
return 1;
138146
#endif
139147
}]])],[
140148
ac_cv_crypt_md5=yes
@@ -146,6 +154,8 @@ int main() {
146154

147155
AC_CACHE_CHECK(for Blowfish crypt, ac_cv_crypt_blowfish,[
148156
AC_RUN_IFELSE([AC_LANG_SOURCE([[
157+
#include <string.h>
158+
149159
#if HAVE_UNISTD_H
150160
#include <unistd.h>
151161
#endif
@@ -164,9 +174,9 @@ int main() {
164174
strcpy(answer,salt);
165175
strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra");
166176
encrypted = crypt("rasmuslerdorf",salt);
167-
exit(!encrypted || strcmp(encrypted,answer));
177+
return !encrypted || strcmp(encrypted,answer);
168178
#else
169-
exit(1);
179+
return 1;
170180
#endif
171181
}]])],[
172182
ac_cv_crypt_blowfish=yes
@@ -178,6 +188,8 @@ int main() {
178188

179189
AC_CACHE_CHECK(for SHA512 crypt, ac_cv_crypt_sha512,[
180190
AC_RUN_IFELSE([AC_LANG_SOURCE([[
191+
#include <string.h>
192+
181193
#if HAVE_UNISTD_H
182194
#include <unistd.h>
183195
#endif
@@ -195,9 +207,9 @@ int main() {
195207
strcpy(answer, salt);
196208
strcat(answer, "EeHCRjm0bljalWuALHSTs1NB9ipEiLEXLhYeXdOpx22gmlmVejnVXFhd84cEKbYxCo.XuUTrW.RLraeEnsvWs/");
197209
encrypted = crypt("rasmuslerdorf",salt);
198-
exit(!encrypted || strcmp(encrypted,answer));
210+
return !encrypted || strcmp(encrypted,answer);
199211
#else
200-
exit(1);
212+
return 1;
201213
#endif
202214
}]])],[
203215
ac_cv_crypt_sha512=yes
@@ -209,6 +221,8 @@ int main() {
209221

210222
AC_CACHE_CHECK(for SHA256 crypt, ac_cv_crypt_sha256,[
211223
AC_RUN_IFELSE([AC_LANG_SOURCE([[
224+
#include <string.h>
225+
212226
#if HAVE_UNISTD_H
213227
#include <unistd.h>
214228
#endif
@@ -226,9 +240,9 @@ int main() {
226240
strcpy(answer, salt);
227241
strcat(answer, "cFAm2puLCujQ9t.0CxiFIIvFi4JyQx5UncCt/xRIX23");
228242
encrypted = crypt("rasmuslerdorf",salt);
229-
exit(!encrypted || strcmp(encrypted,answer));
243+
return !encrypted || strcmp(encrypted,answer);
230244
#else
231-
exit(1);
245+
return 1;
232246
#endif
233247
}]])],[
234248
ac_cv_crypt_sha256=yes

0 commit comments

Comments
 (0)