subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1518172 - /subversion/trunk/build/generator/gen_win_dependencies.py
Date Wed, 28 Aug 2013 11:50:52 GMT
Author: rhuijben
Date: Wed Aug 28 11:50:51 2013
New Revision: 1518172

URL: http://svn.apache.org/r1518172
Log:
* build/generator/gen_win_dependencies.py
  Resolve about a dozen test failures by defining a NUM2LL macro when building
  the swig ruby bindings to make sure swig doesn't redefine a macro in an
  invalid way.

Modified:
    subversion/trunk/build/generator/gen_win_dependencies.py

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1518172&r1=1518171&r2=1518172&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Wed Aug 28 11:50:51 2013
@@ -787,6 +787,13 @@ class GenDependenciesBase(gen_base.Gener
       defines.extend(["HAVE_RB_ERRINFO"])
 
     forced_includes = []
+
+    if ver >= (1, 8, 0):
+      # Swig redefines NUM2LL as NUM2LONG if it isn't defined, but on Windows
+      # ruby 1.8+ declares NUM2LL as a static inline function.
+      # (LL2NUM and NUM2ULL don't have these problems)
+      defines.extend(['NUM2LL=NUM2LL'])
+
     if ver >= (1, 9, 0):
       forced_includes.append('swigutil_rb__pre_ruby.h')
       defines.extend(["SVN_SWIG_RUBY__CUSTOM_RUBY_CONFIG"])



Mime
View raw message