[Freeswitch-svn] [commit] r11524 - in freeswitch/trunk/libs/apr: . build

[FreeSWITCH SVN]

Author: mikej
Date: Tue Jan 27 17:58:49 2009
New Revision: 11524

Log:
libapr: fix configure when -Werror is in CFLAGS

Modified:
   freeswitch/trunk/libs/apr/build/apr_common.m4
   freeswitch/trunk/libs/apr/build/apr_network.m4
   freeswitch/trunk/libs/apr/build/apr_threads.m4
   freeswitch/trunk/libs/apr/configure.in

Modified: freeswitch/trunk/libs/apr/build/apr_common.m4
==============================================================================
--- freeswitch/trunk/libs/apr/build/apr_common.m4	(original)
+++ freeswitch/trunk/libs/apr/build/apr_common.m4	Tue Jan 27 17:58:49 2009
@@ -461,7 +461,9 @@
 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 @@
 #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 @@
 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

Modified: freeswitch/trunk/libs/apr/build/apr_network.m4
==============================================================================
--- freeswitch/trunk/libs/apr/build/apr_network.m4	(original)
+++ freeswitch/trunk/libs/apr/build/apr_network.m4	Tue Jan 27 17:58:49 2009
@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 #endif
 
-void main(void) {
+int main(void) {
     struct addrinfo hints, *ai;
     int error;
 
@@ -129,7 +129,7 @@
 #include <netinet/in.h>
 #endif
 
-void main(void) {
+int main(void) {
     struct sockaddr_in sa;
     char hbuf[256];
     int error;
@@ -172,7 +172,7 @@
 #include <netdb.h>
 #endif
 
-void main(void) {
+int main(void) {
     if (EAI_ADDRFAMILY < 0) {
         exit(0);
     }

Modified: freeswitch/trunk/libs/apr/build/apr_threads.m4
==============================================================================
--- freeswitch/trunk/libs/apr/build/apr_threads.m4	(original)
+++ freeswitch/trunk/libs/apr/build/apr_threads.m4	Tue Jan 27 17:58:49 2009
@@ -100,7 +100,7 @@
     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 @@
 #include <pthread.h>
 #include <stdlib.h>
 
-int main() {
+int main(void) {
     pthread_mutexattr_t attr;
     pthread_mutex_t m;
 

Modified: freeswitch/trunk/libs/apr/configure.in
==============================================================================
--- freeswitch/trunk/libs/apr/configure.in	(original)
+++ freeswitch/trunk/libs/apr/configure.in	Tue Jan 27 17:58:49 2009
@@ -455,7 +455,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-void main(void)
+int main(void)
 {
     int fd, ret = 0;
     struct stat64 st;