Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 1262 invoked from network); 8 Aug 2010 12:30:25 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Aug 2010 12:30:25 -0000 Received: (qmail 26267 invoked by uid 500); 8 Aug 2010 12:30:25 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 26160 invoked by uid 500); 8 Aug 2010 12:30:23 -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 26153 invoked by uid 99); 8 Aug 2010 12:30:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Aug 2010 12:30:22 +0000 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; Sun, 08 Aug 2010 12:30:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 658A423889D5; Sun, 8 Aug 2010 12:29:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r983400 - in /apr/apr/trunk: include/apr_version.h libapr.rc Date: Sun, 08 Aug 2010 12:29:05 -0000 To: commits@apr.apache.org From: fuankg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100808122905.658A423889D5@eris.apache.org> Author: fuankg Date: Sun Aug 8 12:29:05 2010 New Revision: 983400 URL: http://svn.apache.org/viewvc?rev=983400&view=rev Log: Revert r982499 and change macro in apr_version.h instead. MingW32 windres issued a couple of warnings, and Watcom wrc broke with this macro. This version tested with MingW32, Watcom, OpenWatcom, MSVC6, MSVC7, and all can create now a *.res warning-free. Modified: apr/apr/trunk/include/apr_version.h apr/apr/trunk/libapr.rc Modified: apr/apr/trunk/include/apr_version.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_version.h?rev=983400&r1=983399&r2=983400&view=diff ============================================================================== --- apr/apr/trunk/include/apr_version.h (original) +++ apr/apr/trunk/include/apr_version.h Sun Aug 8 12:29:05 2010 @@ -109,9 +109,9 @@ /** An alternative formatted string of APR's version */ /* macro for Win32 .rc files using numeric csv representation */ -#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION ##, \ - ##APR_MINOR_VERSION ##, \ - ##APR_PATCH_VERSION +#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION, \ + APR_MINOR_VERSION, \ + APR_PATCH_VERSION #ifndef APR_VERSION_ONLY Modified: apr/apr/trunk/libapr.rc URL: http://svn.apache.org/viewvc/apr/apr/trunk/libapr.rc?rev=983400&r1=983399&r2=983400&view=diff ============================================================================== --- apr/apr/trunk/libapr.rc (original) +++ apr/apr/trunk/libapr.rc Sun Aug 8 12:29:05 2010 @@ -21,8 +21,8 @@ 1 VERSIONINFO - FILEVERSION APR_MAJOR_VERSION,APR_MINOR_VERSION,APR_PATCH_VERSION,0 - PRODUCTVERSION APR_MAJOR_VERSION,APR_MINOR_VERSION,APR_PATCH_VERSION,0 + FILEVERSION APR_VERSION_STRING_CSV,0 + PRODUCTVERSION APR_VERSION_STRING_CSV,0 FILEFLAGSMASK 0x3fL #if defined(APR_IS_DEV_VERSION) #if defined(_DEBUG)