Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 60416 invoked from network); 21 Mar 2011 19:35:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Mar 2011 19:35:57 -0000 Received: (qmail 75322 invoked by uid 500); 21 Mar 2011 19:35:57 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 75283 invoked by uid 500); 21 Mar 2011 19:35:57 -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 75276 invoked by uid 99); 21 Mar 2011 19:35:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2011 19:35:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 21 Mar 2011 19:35:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B399523889E0; Mon, 21 Mar 2011 19:35:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1083914 - in /apr/apr/branches: 0.9.x/passwd/apr_getpass.c 1.3.x/passwd/apr_getpass.c 1.4.x/passwd/apr_getpass.c 1.5.x/passwd/apr_getpass.c Date: Mon, 21 Mar 2011 19:35:24 -0000 To: commits@apr.apache.org From: fuankg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110321193524.B399523889E0@eris.apache.org> Author: fuankg Date: Mon Mar 21 19:35:24 2011 New Revision: 1083914 URL: http://svn.apache.org/viewvc?rev=1083914&view=rev Log: Backport of blocking MSVC pragmas (r892909). Modified: apr/apr/branches/0.9.x/passwd/apr_getpass.c apr/apr/branches/1.3.x/passwd/apr_getpass.c apr/apr/branches/1.4.x/passwd/apr_getpass.c apr/apr/branches/1.5.x/passwd/apr_getpass.c Modified: apr/apr/branches/0.9.x/passwd/apr_getpass.c URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/passwd/apr_getpass.c?rev=1083914&r1=1083913&r2=1083914&view=diff ============================================================================== --- apr/apr/branches/0.9.x/passwd/apr_getpass.c (original) +++ apr/apr/branches/0.9.x/passwd/apr_getpass.c Mon Mar 21 19:35:24 2011 @@ -34,9 +34,13 @@ #include #endif #if APR_HAVE_CONIO_H +#ifdef _MSC_VER #pragma warning(disable: 4032) #include #pragma warning(default: 4032) +#else +#include +#endif #endif #if APR_HAVE_STDLIB_H #include Modified: apr/apr/branches/1.3.x/passwd/apr_getpass.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/passwd/apr_getpass.c?rev=1083914&r1=1083913&r2=1083914&view=diff ============================================================================== --- apr/apr/branches/1.3.x/passwd/apr_getpass.c (original) +++ apr/apr/branches/1.3.x/passwd/apr_getpass.c Mon Mar 21 19:35:24 2011 @@ -34,9 +34,13 @@ #include #endif #if APR_HAVE_CONIO_H +#ifdef _MSC_VER #pragma warning(disable: 4032) #include #pragma warning(default: 4032) +#else +#include +#endif #endif #if APR_HAVE_STDLIB_H #include Modified: apr/apr/branches/1.4.x/passwd/apr_getpass.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/passwd/apr_getpass.c?rev=1083914&r1=1083913&r2=1083914&view=diff ============================================================================== --- apr/apr/branches/1.4.x/passwd/apr_getpass.c (original) +++ apr/apr/branches/1.4.x/passwd/apr_getpass.c Mon Mar 21 19:35:24 2011 @@ -34,9 +34,13 @@ #include #endif #if APR_HAVE_CONIO_H +#ifdef _MSC_VER #pragma warning(disable: 4032) #include #pragma warning(default: 4032) +#else +#include +#endif #endif #if APR_HAVE_STDLIB_H #include Modified: apr/apr/branches/1.5.x/passwd/apr_getpass.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/passwd/apr_getpass.c?rev=1083914&r1=1083913&r2=1083914&view=diff ============================================================================== --- apr/apr/branches/1.5.x/passwd/apr_getpass.c (original) +++ apr/apr/branches/1.5.x/passwd/apr_getpass.c Mon Mar 21 19:35:24 2011 @@ -34,9 +34,13 @@ #include #endif #if APR_HAVE_CONIO_H +#ifdef _MSC_VER #pragma warning(disable: 4032) #include #pragma warning(default: 4032) +#else +#include +#endif #endif #if APR_HAVE_STDLIB_H #include