summaryrefslogtreecommitdiffstats
path: root/qtruby/bin/qtrubyinit.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-11 12:52:49 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-11 12:52:49 -0500
commitef7a60860d18e9be343b6fa5fe8d76fd080cead0 (patch)
tree640a3f17c9f0e1d133b05f1eb434d13057a78e8d /qtruby/bin/qtrubyinit.cpp
parent46659f992d49f86347c43528a8705657b6896cb7 (diff)
downloadtdebindings-ef7a60860d18e9be343b6fa5fe8d76fd080cead0.tar.gz
tdebindings-ef7a60860d18e9be343b6fa5fe8d76fd080cead0.zip
Fix FTBS on ruby 1.9.x
Thanks to Darrell Anderson for the majority of the patch!
Diffstat (limited to 'qtruby/bin/qtrubyinit.cpp')
-rw-r--r--qtruby/bin/qtrubyinit.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/qtruby/bin/qtrubyinit.cpp b/qtruby/bin/qtrubyinit.cpp
index c4e80240..65c00c40 100644
--- a/qtruby/bin/qtrubyinit.cpp
+++ b/qtruby/bin/qtrubyinit.cpp
@@ -1,5 +1,13 @@
#include <ruby.h>
+#include "config.h"
+
+#ifndef HAVE_RUBY_1_9
+#define RARRAY_LEN(x) (RARRAY(x)->len)
+#define RSTRING_LEN(x) (RSTRING(x)->len)
+#define rb_str_catf_1 rb_str_catf
+#endif
+
/***************************************************************************
qrubyinit - makes use of tdeinit_wrapper possible for ruby programs
-------------------
@@ -24,6 +32,6 @@ static const char* script_name = "qrubyinit_app";
int main(int argc, char **argv) {
ruby_init();
ruby_script((char*)script_name);
- ruby_options(argc, argv);
- ruby_run();
+ void* node = ruby_options(argc, argv);
+ ruby_run_node(node);
}