apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r983400 - in /apr/apr/trunk: include/apr_version.h libapr.rc
Date Sun, 08 Aug 2010 12:29:05 GMT
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)



Mime
View raw message