1 --- libprelude-1.0.0/m4/am_path_ruby.m4.orig 2010-01-11 12:09:42.000000000 +0100
2 +++ libprelude-1.0.0/m4/am_path_ruby.m4 2011-08-07 16:18:31.583033709 +0200
4 AC_SUBST([rbexecdir], [$am_cv_ruby_rbexecdir])
6 RUBY_INCLUDES=`$RUBY -r rbconfig -e 'if Config::CONFIG[["archdir"]] then print " -I" + Config::CONFIG[["archdir"]] end
7 - if Config::CONFIG[["rubyhdrdir"]] then print " -I" + Config::CONFIG[["rubyhdrdir"]] end'`
8 + if Config::CONFIG[["rubyhdrdir"]] then print " -I" + Config::CONFIG[["rubyhdrdir"]]; print " -I" + Config::CONFIG[["rubyhdrdir"]] + "/" + Config::CONFIG[["arch"]] end'`
9 AC_SUBST([RUBY_INCLUDES])
11 dnl pkgrbexecdir -- $(rbexecdir)/$(PACKAGE)
12 --- libprelude-1.0.0/bindings/ruby/libpreludecpp-ruby.i.orig 2011-08-07 21:07:53.936358340 +0200
13 +++ libprelude-1.0.0/bindings/ruby/libpreludecpp-ruby.i 2011-08-08 20:26:34.566624741 +0200
21 +#define OpenFile rb_io_t
26 VALUE *io = (VALUE *) prelude_msgbuf_get_data(fd);
28 GetOpenFile(*io, fptr);
30 + f = fptr->stdio_file;
32 ret = fwrite((const char *) prelude_msg_get_message_data(msg), 1, prelude_msg_get_len(msg), f);
33 if ( ret != prelude_msg_get_len(msg) )
35 VALUE *io = (VALUE *) prelude_io_get_fdptr(fd);
37 GetOpenFile(*io, fptr);
39 + f = fptr->stdio_file;
41 ret = fread(buf, 1, size, f);
44 VALUE IDMEFValueList_to_SWIG(const Prelude::IDMEFValue &value)
49 std::vector<Prelude::IDMEFValue> result = value;
50 std::vector<Prelude::IDMEFValue>::const_iterator i;
56 - RARRAY(ary)->ptr[j++] = val;
57 + rb_ary_push(ary, val);
60 - RARRAY(ary)->len = result.size();
66 __initial_thread = (gl_thread_t) gl_thread_self();
68 rbargv = rb_const_get(rb_cObject, rb_intern("ARGV"));
69 - argc = RARRAY(rbargv)->len + 1;
70 + argc = RARRAY_LEN(rbargv) + 1;
73 throw PreludeError("Invalid argc length");
76 throw PreludeError("Allocation failure");
78 - argv[0] = STR2CSTR(rb_gv_get("$0"));
79 + VALUE argv0 = rb_gv_get("$0");
80 + argv[0] = StringValuePtr(argv0);
82 - ptr = RARRAY(rbargv)->ptr;
83 - for ( ptr = RARRAY(rbargv)->ptr, _i = 1; _i < argc; _i++, ptr++ )
84 - argv[_i] = STR2CSTR(*ptr);
85 + ptr = RARRAY_PTR(rbargv);
86 + for ( ptr = RARRAY_PTR(rbargv), _i = 1; _i < argc; _i++, ptr++ )
87 + argv[_i] = StringValuePtr(*ptr);