Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 42127 invoked from network); 20 Apr 2006 01:43:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Apr 2006 01:43:26 -0000 Received: (qmail 90930 invoked by uid 500); 20 Apr 2006 01:43:26 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 90832 invoked by uid 500); 20 Apr 2006 01:43:25 -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 90821 invoked by uid 99); 20 Apr 2006 01:43:25 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Apr 2006 18:43:25 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 19 Apr 2006 18:43:25 -0700 Received: (qmail 42018 invoked by uid 65534); 20 Apr 2006 01:43:04 -0000 Message-ID: <20060420014304.42016.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r395461 - /apr/apr-iconv/branches/0.9.x/libapriconv.rc Date: Thu, 20 Apr 2006 01:43:04 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: wrowe Date: Wed Apr 19 18:43:02 2006 New Revision: 395461 URL: http://svn.apache.org/viewcvs?rev=395461&view=rev Log: The libapriconv.dll is VOS_DLL, not VOS_APP. Correctly designate this a pre-release when the isdev flag is set, and indicate NT only for explicit NT builds. Backports: 395460 Modified: apr/apr-iconv/branches/0.9.x/libapriconv.rc Modified: apr/apr-iconv/branches/0.9.x/libapriconv.rc URL: http://svn.apache.org/viewcvs/apr/apr-iconv/branches/0.9.x/libapriconv.rc?rev=395461&r1=395460&r2=395461&view=diff ============================================================================== --- apr/apr-iconv/branches/0.9.x/libapriconv.rc (original) +++ apr/apr-iconv/branches/0.9.x/libapriconv.rc Wed Apr 19 18:43:02 2006 @@ -30,13 +30,25 @@ FILEVERSION API_VERSION_STRING_CSV,0 PRODUCTVERSION API_VERSION_STRING_CSV,0 FILEFLAGSMASK 0x3fL +#if defined(APR_IS_DEV_VERSION) +#if defined(_DEBUG) + FILEFLAGS 0x03L +#else + FILEFLAGS 0x02L +#endif +#else #if defined(_DEBUG) FILEFLAGS 0x01L #else FILEFLAGS 0x00L #endif +#endif +#if defined(WINNT) || defined(WIN64) FILEOS 0x40004L - FILETYPE 0x1L +#else + FILEOS 0x4L +#endif + FILETYPE 0x2L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo"