summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2023-01-03 08:51:28 +0000
committerJoe Orton <jorton@apache.org>2023-01-03 08:51:28 +0000
commit3c446343a88024251027c91cc21609034944ba6e (patch)
tree8c4b3130bce5efdd66b0ee2bbd4edc53ade07140
parent9946ecfac968fd071f5e9b52f3fdedf55dd7893c (diff)
downloadapr-3c446343a88024251027c91cc21609034944ba6e.tar.gz
Merge r1906347 from trunk:
Fix configure for compilers which don't accept implicit int (no longer part of C since C99). Submitted by: Florian Weimer <fweimer redhat.com> PR: 66396 git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1906349 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES3
-rw-r--r--build/apr_common.m42
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index fd1e749bd..7059b653d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ Changes for APR 1.7.1
(This issue was addressed as CVE-2017-12613 in APR 1.6.3 and
later 1.6.x releases, but was missing in 1.7.0.) [Stefan Sperling]
+ *) configure: Fix configure for compilers which don't accept implicit
+ "int". PR 66396. [Florian Weimer <fweimer redhat.com>]
+
*) apr_atomic_read64(): Fix non-atomic read on 32-bit Windows [Ivan Zhakov]
*) configure: Prefer posix name-based shared memory over SysV IPC.
diff --git a/build/apr_common.m4 b/build/apr_common.m4
index 0c1d2f23f..ac2312c63 100644
--- a/build/apr_common.m4
+++ b/build/apr_common.m4
@@ -499,7 +499,7 @@ AC_CACHE_CHECK([whether return code from strerror_r has type int],
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-main()
+int main(void)
{
char buf[1024];
if (strerror_r(ERANGE, buf, sizeof buf) < 1) {