diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-03-23 18:13:35 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-03-23 18:13:35 +0100 |
| commit | 5daf2fbc51682f117572fe1f6a78522177dedef5 (patch) | |
| tree | 92bfa0fb72fc49a9530186ab30f25099cf379668 /lib/kross/ruby | |
| parent | 920d54124a7ed87e205b280038934d9c3a55cee1 (diff) | |
| download | koffice-5daf2fbc51682f117572fe1f6a78522177dedef5.tar.gz koffice-5daf2fbc51682f117572fe1f6a78522177dedef5.zip | |
Fix FTBFS because of conflict between config.h generated by automake
and Ruby headers.
Instead of using config.h in Ruby related code, the definitions
related to Ruby version are added to CFLAGS.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'lib/kross/ruby')
| -rw-r--r-- | lib/kross/ruby/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/kross/ruby/rubyinterpreter.cpp | 1 | ||||
| -rw-r--r-- | lib/kross/ruby/rubywrapper.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/lib/kross/ruby/Makefile.am b/lib/kross/ruby/Makefile.am index 25872fddf..1dba42439 100644 --- a/lib/kross/ruby/Makefile.am +++ b/lib/kross/ruby/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/lib/kross/Makefile.global CXXFLAGS += $(USE_EXCEPTIONS) -INCLUDES = -I$(top_srcdir)/lib/kross -I$(RUBY_INCLUDEDIR) $(RUBY_CFLAGS) $(all_includes) +INCLUDES = -I$(top_srcdir)/lib/kross -I$(RUBY_INCLUDEDIR) $(RUBY_CFLAGS) $(RUBY_VERSION_DEFS) $(all_includes) METASOURCES = AUTO kde_module_LTLIBRARIES = krossruby.la diff --git a/lib/kross/ruby/rubyinterpreter.cpp b/lib/kross/ruby/rubyinterpreter.cpp index 3504ca7c4..b453a238f 100644 --- a/lib/kross/ruby/rubyinterpreter.cpp +++ b/lib/kross/ruby/rubyinterpreter.cpp @@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. ***************************************************************************/ -#include "config.h" #include "rubyinterpreter.h" #include <map> diff --git a/lib/kross/ruby/rubywrapper.c b/lib/kross/ruby/rubywrapper.c index a25b1b282..5fafd6b80 100644 --- a/lib/kross/ruby/rubywrapper.c +++ b/lib/kross/ruby/rubywrapper.c @@ -17,7 +17,6 @@ * Boston, MA 02110-1301, USA. ***************************************************************************/ -#include "config.h" #include "ruby.h" void kross_rb_set_safe_level(int safelevel) { |