subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1692783 - in /subversion/branches/1.7.x: ./ STATUS build/generator/gen_win.py
Date Sun, 26 Jul 2015 22:54:18 GMT
Author: brane
Date: Sun Jul 26 22:54:17 2015
New Revision: 1692783

URL: http://svn.apache.org/r1692783
Log:
Merge the 1.7.x-VS2015 branch:

 * ^/subversion/branches/1.7.x-VS2015
   Fix compilation with VS2015 when ruby is found
   Justification:
     Avoid overriding 'snprintf' on Visual Studio version(s) that define
     this function directly, avoids compilation errors.
   Votes:
     +1: rhuijben, brane

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/build/generator/gen_win.py

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 26 22:54:17 2015
@@ -1,6 +1,7 @@
 /subversion/1.7.x-issue4059:1239661-1239744
 /subversion/branches/1.5.x-r30215:870312
 /subversion/branches/1.7.x-JavaHL-pools:1158684-1158722
+/subversion/branches/1.7.x-VS2015:1692104-1692782
 /subversion/branches/1.7.x-buildfix-neon:1660567-1664788
 /subversion/branches/1.7.x-diff-translate:1568403-1569065
 /subversion/branches/1.7.x-disable_zlib_asm:1593915-1615219

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1692783&r1=1692782&r2=1692783&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sun Jul 26 22:54:17 2015
@@ -143,11 +143,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * ^/subversion/branches/1.7.x-VS2015
-   Fix compilation with VS2015 when ruby is found
-   Justification:
-     Avoid overriding 'snprintf' on Visual Studio version(s) that define
-     this function directly, avoids compilation errors.
-   Votes:
-     +1: rhuijben, brane

Modified: subversion/branches/1.7.x/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build/generator/gen_win.py?rev=1692783&r1=1692782&r2=1692783&view=diff
==============================================================================
--- subversion/branches/1.7.x/build/generator/gen_win.py (original)
+++ subversion/branches/1.7.x/build/generator/gen_win.py Sun Jul 26 22:54:17 2015
@@ -875,7 +875,7 @@ class WinGeneratorBase(GeneratorBase):
       if target.name == 'mod_dav_svn':
         fakedefines.extend(["AP_DECLARE_EXPORT"])
 
-    if target.name.find('ruby') == -1:
+    if target.name.find('ruby') == -1 and float(self.vcproj_version) < 14.0:
       fakedefines.append("snprintf=_snprintf")
 
     if isinstance(target, gen_base.TargetSWIG):



Mime
View raw message