diff options
| author | François Andriot <francois.andriot@free.fr> | 2021-05-10 20:19:48 +0200 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-05-11 09:27:37 +0900 |
| commit | e58be56584c7510639c55bb20f3000bd9b796284 (patch) | |
| tree | 0f9989edf3752826c12f0f6c2380355dfb3d8c4c | |
| parent | 657a975c63efd3e2d1ef148551c960931d3c1862 (diff) | |
| download | koffice-e58be565.tar.gz koffice-e58be565.zip | |
Fix build on Fedora 34 / Ruby 3.0.1
Signed-off-by: François Andriot <francois.andriot@free.fr>
| -rw-r--r-- | lib/kross/configure.in.in | 3 | ||||
| -rw-r--r-- | lib/kross/ruby/rubyscript.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/kross/configure.in.in b/lib/kross/configure.in.in index ad95e626..c9acf48b 100644 --- a/lib/kross/configure.in.in +++ b/lib/kross/configure.in.in @@ -43,6 +43,9 @@ if test "x$compile_kross" = "xyes" ; then if test "$RUBY_SERIES" -ge "19"; then AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x]) fi + if test "$RUBY_SERIES" -ge "30"; then + AC_DEFINE_UNQUOTED(HAVE_RUBY_3, 1, [Defines if your system has Ruby 3.x]) + fi if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"` diff --git a/lib/kross/ruby/rubyscript.cpp b/lib/kross/ruby/rubyscript.cpp index 381785ff..889383cd 100644 --- a/lib/kross/ruby/rubyscript.cpp +++ b/lib/kross/ruby/rubyscript.cpp @@ -31,7 +31,9 @@ #include <rubysig.h> #include <node.h> #else // HAVE_RUBY_1_9 +#ifndef HAVE_RUBY_3 #include <ruby/backward/rubysig.h> +#endif // HAVE_RUBY_3 #endif // HAVE_RUBY_1_9 #include <main/scriptcontainer.h> |