aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam S Fulton <wsf@fultondesigns.co.uk>2008-11-23 22:29:07 +0000
committerWilliam S Fulton <wsf@fultondesigns.co.uk>2008-11-23 22:29:07 +0000
commitcd43bd063d98a2309f987dd57cfd9374e156252f (patch)
tree98b634f9669fb410caf9f3ab8d554331a9f39301
parentf78bdddb9d3e9448da38c32e5a6bdeab708c4d89 (diff)
downloadswig-cd43bd063d98a2309f987dd57cfd9374e156252f.tar.gz
Apply patch #2263850 to fix ruby/file.i ... rubyio.h filename change in ruby 1.9.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10944 626c5289-ae23-0410-ae9c-e8d60b6d4f22
-rw-r--r--CHANGES.current4
-rw-r--r--Lib/ruby/file.i7
2 files changed, 11 insertions, 0 deletions
diff --git a/CHANGES.current b/CHANGES.current
index b8def93bc..590e6f47f 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -2,6 +2,10 @@ Version 1.3.37 (in progress)
============================
2008-11-23: wsfulton
+ [ruby] Apply patch #2263850 to fix ruby/file.i ... rubyio.h filename change in
+ ruby 1.9.
+
+2008-11-23: wsfulton
Apply patch #2319790 from Johan Hake to fix shared_ptr usage in std::tr1 namespace.
2008-11-21: wsfulton
diff --git a/Lib/ruby/file.i b/Lib/ruby/file.i
index 54ed0a609..d64937ed1 100644
--- a/Lib/ruby/file.i
+++ b/Lib/ruby/file.i
@@ -3,7 +3,14 @@
#ifdef __cplusplus
extern "C" {
#endif
+
+// Ruby 1.9 changed the file name of this header
+#ifdef HAVE_RUBY_IO_H
+#include "ruby/io.h"
+#else
#include "rubyio.h"
+#endif
+
#ifdef __cplusplus
}
#endif