apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r661159 - in /apr/apr/trunk/build: apr_hints.m4 apr_network.m4
Date Thu, 29 May 2008 00:05:35 GMT
Author: bojan
Date: Wed May 28 17:05:35 2008
New Revision: 661159

URL: http://svn.apache.org/viewvc?rev=661159&view=rev
Log:
If -Wall is turned on, result of compile tests may be altered.
Use the variable to avoid warnings.
Trivial style fixes.

Modified:
    apr/apr/trunk/build/apr_hints.m4
    apr/apr/trunk/build/apr_network.m4

Modified: apr/apr/trunk/build/apr_hints.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apr_hints.m4?rev=661159&r1=661158&r2=661159&view=diff
==============================================================================
--- apr/apr/trunk/build/apr_hints.m4 (original)
+++ apr/apr/trunk/build/apr_hints.m4 Wed May 28 17:05:35 2008
@@ -415,19 +415,19 @@
 	APR_ADDTO(CPPFLAGS, [-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1])
 	;;
     *-ibm-os390)
-       APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
-       APR_SETIFNULL(apr_sysvsem_is_global, [yes])
-       APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
-       APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
-       AC_DEFINE(HAVE_ZOS_PTHREADS, 1, [Define for z/OS pthread API nuances])
-       APR_ADDTO(CPPFLAGS, [-U_NO_PROTO -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1])
-       ;;
+        APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
+        APR_SETIFNULL(apr_sysvsem_is_global, [yes])
+        APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
+        APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
+        AC_DEFINE(HAVE_ZOS_PTHREADS, 1, [Define for z/OS pthread API nuances])
+        APR_ADDTO(CPPFLAGS, [-U_NO_PROTO -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1])
+        ;;
     *-ibm-as400)
-       APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
-       APR_SETIFNULL(apr_process_lock_is_global, [yes])
-       APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
-       APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
-       ;;
+        APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
+        APR_SETIFNULL(apr_process_lock_is_global, [yes])
+        APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
+        APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
+        ;;
     *cygwin*)
 	APR_ADDTO(CPPFLAGS, [-DCYGWIN])
 	;;

Modified: apr/apr/trunk/build/apr_network.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apr_network.m4?rev=661159&r1=661158&r2=661159&view=diff
==============================================================================
--- apr/apr/trunk/build/apr_network.m4 (original)
+++ apr/apr/trunk/build/apr_network.m4 Wed May 28 17:05:35 2008
@@ -244,6 +244,8 @@
 ],[
 int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, 
                           (char *) 0, 0, (struct hostent **) 0, &tmp);
+/* use tmp to suppress the warning */
+tmp=0;
 ], ac_cv_gethostbyname_r_style=glibc2, ac_cv_gethostbyname_r_style=none))
 
 if test "$ac_cv_gethostbyname_r_style" = "glibc2"; then
@@ -269,8 +271,10 @@
 #endif
 ],[
 int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, 
-                          (struct hostent_data *) 0);],
-ac_cv_gethostbyname_r_arg=hostent_data, ac_cv_gethostbyname_r_arg=char))
+                          (struct hostent_data *) 0);
+/* use tmp to suppress the warning */
+tmp=0;
+], ac_cv_gethostbyname_r_arg=hostent_data, ac_cv_gethostbyname_r_arg=char))
 
 if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then
     AC_DEFINE(GETHOSTBYNAME_R_HOSTENT_DATA, 1, [Define if gethostbyname_r has the hostent_data
for the third argument])



Mime
View raw message