Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 583126 | Differences between
and this patch

Collapse All | Expand All

(-)libprelude-3.0.0/bindings/ruby/Prelude.cxx (-1 / +22 lines)
Lines 867-873 Link Here
867
#define  SWIG_NullReferenceError   -13
867
#define  SWIG_NullReferenceError   -13
868
868
869
869
870
870
#ifdef __cplusplus
871
// Work around C++ incompatibility in Ruby 2.3.0 headers:
872
// https://bugs.ruby-lang.org/issues/11962
873
# include <ruby/config.h>
874
# ifdef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
875
#  undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
876
# endif
877
# ifdef HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P
878
#  undef HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P
879
# endif
880
#endif
871
#include <ruby.h>
881
#include <ruby.h>
872
882
873
/* Ruby 1.9.1 has a "memoisation optimisation" when compiling with GCC which
883
/* Ruby 1.9.1 has a "memoisation optimisation" when compiling with GCC which
Lines 2596-2601 Link Here
2596
2606
2597
extern "C" {
2607
extern "C" {
2598
2608
2609
#ifdef __cplusplus
2610
// Work around C++ incompatibility in Ruby 2.3.0 headers:
2611
// https://bugs.ruby-lang.org/issues/11962
2612
# include <ruby/config.h>
2613
# ifdef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
2614
#  undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
2615
# endif
2616
# ifdef HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P
2617
#  undef HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P
2618
# endif
2619
#endif
2599
#include <ruby.h>
2620
#include <ruby.h>
2600
/*
2621
/*
2601
 * cannot put libmissing into the include path, as it will trigger
2622
 * cannot put libmissing into the include path, as it will trigger

Return to bug 583126