Merge r1906594 from trunk:

Fix further strict C99 compliance issue. (fixes #37)

PR: 66408
Submitted by: Sam James <sam gentoo.org>




git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.8.x@1906598 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 28 insertions, 5 deletions

diff --git a/build/apr_network.m4 b/build/apr_network.m4
index 21e9ce7e6..b3dd33fca 100644
--- a/build/apr_network.m4
+++ b/build/apr_network.m4
@@ -66,6 +66,12 @@ AC_DEFUN([APR_CHECK_WORKING_GETADDRINFO], [
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
 
 int main(void) {
     struct addrinfo hints, *ai;
@@ -400,9 +406,11 @@ AC_DEFUN([APR_CHECK_TCP_NODELAY_INHERITED], [
   AC_CACHE_CHECK(if TCP_NODELAY setting is inherited from listening sockets, ac_cv_tcp_nodelay_inherited,[
   AC_TRY_RUN( [
 #include <stdio.h>
+#include <stdlib.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#include <string.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -752,6 +760,12 @@ AC_TRY_COMPILE([
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
 ],[
 inet_addr("127.0.0.1");
 ],[
@@ -772,6 +786,10 @@ fi
 AC_DEFUN([APR_CHECK_INET_NETWORK], [
 AC_CACHE_CHECK(for inet_network, ac_cv_func_inet_network,[
 AC_TRY_COMPILE([
+#include <sys/socket.h>
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -958,7 +976,9 @@ AC_DEFUN([APR_CHECK_MCAST], [
 AC_CACHE_CHECK([for struct ip_mreq], [apr_cv_struct_ipmreq], [
 AC_TRY_COMPILE([
 #include <sys/types.h>
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 ], [
     struct ip_mreq mip;
     mip.imr_interface.s_addr = INADDR_ANY;
diff --git a/configure.in b/configure.in
index a86f343d5..9cdff8f95 100644
--- a/configure.in
+++ b/configure.in
@@ -1562,8 +1562,6 @@ AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ])
 AC_DECL_SYS_SIGLIST
 
 AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ])
-APR_CHECK_INET_ADDR
-APR_CHECK_INET_NETWORK
 AC_SUBST(apr_inaddr_none)
 AC_CHECK_FUNC(_getch)
 AC_CHECK_FUNCS(strerror_r, [ strerror_r="1" ], [ strerror_r="0" ])
@@ -1669,6 +1667,9 @@ APR_FLAG_HEADERS(
     sys/un.h		\
     sys/wait.h)
 
+APR_CHECK_INET_ADDR
+APR_CHECK_INET_NETWORK
+
 # IRIX 6.5 has a problem in <netinet/tcp.h> which prevents it from
 # being included by itself.  Check for <netinet/tcp.h> manually,
 # including another header file first.
@@ -2371,7 +2372,7 @@ AC_TRY_RUN([
 #ifndef SEM_FAILED
 #define SEM_FAILED (-1)
 #endif
-main()
+int main()
 {
     sem_t *psem;
     const char *sem_name = "/apr_autoconf";
@@ -2568,6 +2569,8 @@ int fd;
 struct flock proc_mutex_lock_it = {0};
 const char *fname = "conftest.fcntl";
 
+int lockit();
+
 int main()
 {
     int rc, status;;
diff --git a/poll/os2/pollset.c b/poll/os2/pollset.c
index c407f5d98..1dcdfd298 100644
--- a/poll/os2/pollset.c
+++ b/poll/os2/pollset.c
@@ -308,7 +308,7 @@ APR_DECLARE(apr_status_t) apr_pollset_wakeup(apr_pollset_t *pollset)
 
 
 
-APR_DECLARE(const char *) apr_poll_method_defname()
+APR_DECLARE(const char *) apr_poll_method_defname(void)
 {
     return "select";
 }
diff --git a/poll/unix/pollset.c b/poll/unix/pollset.c
index 6a2013637..97d7724c6 100644
--- a/poll/unix/pollset.c
+++ b/poll/unix/pollset.c
@@ -202,7 +202,7 @@ APR_DECLARE(const char *) apr_pollset_method_name(apr_pollset_t *pollset)
     return pollset->provider->name;
 }
 
-APR_DECLARE(const char *) apr_poll_method_defname()
+APR_DECLARE(const char *) apr_poll_method_defname(void)
 {
     const apr_pollset_provider_t *provider = NULL;