From a98b34a60b17f06767a24aecf1845e55eccc1daf Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Tue, 27 Jan 2009 23:58:49 +0000
Subject: [PATCH] libapr: fix configure when -Werror is in CFLAGS

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11524 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 libs/apr/build/apr_common.m4  | 8 +++++---
 libs/apr/build/apr_network.m4 | 6 +++---
 libs/apr/build/apr_threads.m4 | 4 ++--
 libs/apr/configure.in         | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/libs/apr/build/apr_common.m4 b/libs/apr/build/apr_common.m4
index e7fd567368..6d4a60781a 100644
--- a/libs/apr/build/apr_common.m4
+++ b/libs/apr/build/apr_common.m4
@@ -461,7 +461,9 @@ AC_MSG_CHECKING(size of $2)
 AC_CACHE_VAL(AC_CV_NAME,
 [AC_TRY_RUN([#include <stdio.h>
 $1
-main()
+#include <stdlib.h>
+
+int main(void)
 {
   FILE *f=fopen("conftestval","w");
   if (!f) exit(1);
@@ -517,7 +519,7 @@ AC_TRY_RUN([
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
-main()
+int main(void)
 {
   char buf[1024];
   if (strerror_r(ERANGE, buf, sizeof buf) < 1) {
@@ -942,7 +944,7 @@ else
 dnl <sys/types.h> should be available everywhere!
   cat > conftest.c <<EOF
 #include <sys/types.h>
-  int main() { return 0; }
+  int main(void) { return 0; }
 EOF
   MKDEP="true"
   for i in "$CC -MM" "$CC -M" "$CPP -MM" "$CPP -M" "cpp -M"; do
diff --git a/libs/apr/build/apr_network.m4 b/libs/apr/build/apr_network.m4
index 2b5a2a2bd2..c6e199ca8d 100644
--- a/libs/apr/build/apr_network.m4
+++ b/libs/apr/build/apr_network.m4
@@ -41,7 +41,7 @@ AC_DEFUN(APR_CHECK_WORKING_GETADDRINFO,[
 #include <sys/socket.h>
 #endif
 
-void main(void) {
+int main(void) {
     struct addrinfo hints, *ai;
     int error;
 
@@ -129,7 +129,7 @@ AC_DEFUN(APR_CHECK_WORKING_GETNAMEINFO,[
 #include <netinet/in.h>
 #endif
 
-void main(void) {
+int main(void) {
     struct sockaddr_in sa;
     char hbuf[256];
     int error;
@@ -172,7 +172,7 @@ AC_DEFUN(APR_CHECK_NEGATIVE_EAI,[
 #include <netdb.h>
 #endif
 
-void main(void) {
+int main(void) {
     if (EAI_ADDRFAMILY < 0) {
         exit(0);
     }
diff --git a/libs/apr/build/apr_threads.m4 b/libs/apr/build/apr_threads.m4
index 62ae0e1a31..06752de795 100644
--- a/libs/apr/build/apr_threads.m4
+++ b/libs/apr/build/apr_threads.m4
@@ -100,7 +100,7 @@ void *thread_routine(void *data) {
     return data;
 }
 
-int main() {
+int main(void) {
     pthread_t thd;
     pthread_mutexattr_t mattr;
     pthread_once_t once_init = PTHREAD_ONCE_INIT;
@@ -228,7 +228,7 @@ AC_DEFUN([APR_CHECK_PTHREAD_RECURSIVE_MUTEX], [
 #include <pthread.h>
 #include <stdlib.h>
 
-int main() {
+int main(void) {
     pthread_mutexattr_t attr;
     pthread_mutex_t m;
 
diff --git a/libs/apr/configure.in b/libs/apr/configure.in
index 84406ccb19..8c0135ab7b 100644
--- a/libs/apr/configure.in
+++ b/libs/apr/configure.in
@@ -455,7 +455,7 @@ if test "$apr_lfs_choice" = "yes"; then
 #include <stdio.h>
 #include <unistd.h>
 
-void main(void)
+int main(void)
 {
     int fd, ret = 0;
     struct stat64 st;