diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-09-11 13:58:23 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-10-13 20:22:45 +0200 |
| commit | 591ffa4e6b4a99f792a674392f4f730d218de516 (patch) | |
| tree | 61b738b29a905c0db55962a1203cd7d69e52bb70 | |
| parent | 7ad4be65ec474a9db521deee659273a6d723e0b8 (diff) | |
| download | tdebindings-591ffa4e6b4a99f792a674392f4f730d218de516.tar.gz tdebindings-591ffa4e6b4a99f792a674392f4f730d218de516.zip | |
Fix FTBFS on ruby 1.8.x
(cherry picked from commit 14594d81891b0bdf9aa03f72b88d6939eee59f02)
| -rw-r--r-- | korundum/bin/krubyinit.cpp | 9 | ||||
| -rw-r--r-- | qtruby/bin/qtrubyinit.cpp | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/korundum/bin/krubyinit.cpp b/korundum/bin/krubyinit.cpp index ed3038d8..4a66fc90 100644 --- a/korundum/bin/krubyinit.cpp +++ b/korundum/bin/krubyinit.cpp @@ -25,13 +25,18 @@ * * ***************************************************************************/ -// this name can be used to allow apps +// this name can be used to allow apps // to detect what they were started with static const char* script_name = "krubyinit_app"; int main(int argc, char **argv) { ruby_init(); ruby_script((char*)script_name); - void* node = ruby_options(argc, argv); +#ifdef HAVE_RUBY_1_9 + void* node = ruby_options(argc, argv); ruby_run_node(node); +#else // HAVE_RUBY_1_9 + ruby_options(argc, argv); + ruby_run(); +#endif // HAVE_RUBY_1_9 } diff --git a/qtruby/bin/qtrubyinit.cpp b/qtruby/bin/qtrubyinit.cpp index b17cb940..b5a820b8 100644 --- a/qtruby/bin/qtrubyinit.cpp +++ b/qtruby/bin/qtrubyinit.cpp @@ -25,13 +25,18 @@ qrubyinit - makes use of kdeinit_wrapper possible for ruby programs * * ***************************************************************************/ -// this name can be used to allow apps +// this name can be used to allow apps // to detect what they were started with static const char* script_name = "qrubyinit_app"; int main(int argc, char **argv) { ruby_init(); ruby_script((char*)script_name); - void* node = ruby_options(argc, argv); +#ifdef HAVE_RUBY_1_9 + void* node = ruby_options(argc, argv); ruby_run_node(node); +#else // HAVE_RUBY_1_9 + ruby_options(argc, argv); + ruby_run(); +#endif // HAVE_RUBY_1_9 } |