From commits-return-9627-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Thu May 29 00:05:57 2008 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 2231 invoked from network); 29 May 2008 00:05:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 May 2008 00:05:56 -0000 Received: (qmail 34727 invoked by uid 500); 29 May 2008 00:05:58 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 34674 invoked by uid 500); 29 May 2008 00:05:58 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 34665 invoked by uid 99); 29 May 2008 00:05:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 May 2008 17:05:58 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 May 2008 00:05:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A97CA2388A0F; Wed, 28 May 2008 17:05:35 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r661159 - in /apr/apr/trunk/build: apr_hints.m4 apr_network.m4 Date: Thu, 29 May 2008 00:05:35 -0000 To: commits@apr.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080529000535.A97CA2388A0F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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])