diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-05 10:48:04 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-05 10:48:04 +0200 |
commit | d3cf5973282d30b1f9f08904e7aaf2675fb51f93 (patch) | |
tree | 53019a8f96309e6eb0f6ef9f5c6478549ba25a6c /build/php.m4 | |
parent | 107962208a19d8b6dc1a190cb25fc37614411e71 (diff) | |
parent | 9ad5381a2f94073f2d84bdda9bc8892d18587fdd (diff) | |
download | php-git-d3cf5973282d30b1f9f08904e7aaf2675fb51f93.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix -Wimplicit-function-declaration in configure
Diffstat (limited to 'build/php.m4')
-rw-r--r-- | build/php.m4 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/build/php.m4 b/build/php.m4 index b4cf3edcf3..16c5e25fba 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -1158,11 +1158,11 @@ $1 int main() { int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600); - if (fd < 0) exit(1); - if (pwrite(fd, "text", 4, 0) != 4) exit(1); + if (fd < 0) return 1; + if (pwrite(fd, "text", 4, 0) != 4) return 1; /* Linux glibc breakage until 2.2.5 */ - if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1); - exit(0); + if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) return 1; + return 0; } ]])],[ @@ -1192,11 +1192,11 @@ $1 int main() { char buf[3]; int fd = open("conftest_in", O_RDONLY); - if (fd < 0) exit(1); - if (pread(fd, buf, 2, 0) != 2) exit(1); + if (fd < 0) return 1; + if (pread(fd, buf, 2, 0) != 2) return 1; /* Linux glibc breakage until 2.2.5 */ - if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); - exit(0); + if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) return 1; + return 0; } ]])],[ ac_cv_pread=yes @@ -1464,8 +1464,8 @@ int main() { FILE *fp = fopencookie(&g, "r", funcs); if (fp && fseek(fp, 8192, SEEK_SET) == 0 && g.pos == 8192) - exit(0); - exit(1); + return 0; + return 1; } ]])], [ |