summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2023-01-17 09:05:29 +0000
committerJoe Orton <jorton@apache.org>2023-01-17 09:05:29 +0000
commit5730597721583cb538091a5e9dd92266ffa3f2ad (patch)
tree0737a42e5e2456175a614742ae23ace3b091ce2b
parente67c1792d460fd8f50fec59cbf828fbff748aa5a (diff)
downloadapr-5730597721583cb538091a5e9dd92266ffa3f2ad.tar.gz
Merge r1906723 from trunk:
Further strict C99 configure fix: Avoid an implicit int in the definition of the main function. Avoids build problems with future C compilers which will not support them by default. Submitted by: Florian Weimer <fweimer redhat.com> PR: 66426 git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1906725 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES2
-rw-r--r--configure.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index f23a5957d..b20301d0a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@ Changes for APR 1.7.1
later 1.6.x releases, but was missing in 1.7.0.) [Stefan Sperling]
*) configure: Fix various build issues for compilers enforcing
- strict C99 compliance. PR 66396, 66408.
+ strict C99 compliance. PR 66396, 66408, 66426.
[Florian Weimer <fweimer redhat.com>, Sam James <sam gentoo.org>]
*) apr_atomic_read64(): Fix non-atomic read on 32-bit Windows [Ivan Zhakov]
diff --git a/configure.in b/configure.in
index 20dfc9de8..29c0d7050 100644
--- a/configure.in
+++ b/configure.in
@@ -2332,7 +2332,7 @@ AC_TRY_RUN([
#include <sys/time.h>
#include <sys/resource.h>
#include <stdlib.h>
-main()
+int main(void)
{
struct rlimit limit;
limit.rlim_cur = 0;