generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-21 23:56:55 +02:00
Code Issues Projects Releases Wiki Activity

ruby: fixes compatibility with ruby-1.8.5

Browse Source
This commit is contained in:
frsyuki
2010-08-31 07:00:19 +09:00
parent b5c78de2dd
commit 09b47cc536
5 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruby/unpack.c
View File

@@ -16,7 +16,7 @@
* limitations under the License.
*/
#include "ruby.h"
#include "encoding.h"
#include "compat.h"
#include "msgpack/unpack_define.h"
@@ -132,7 +132,7 @@ static inline int template_callback_raw(unpack_user* u, const char* b, const cha
} else {
*o = rb_str_substr(u->source, p - b, l);
}
#ifdef MSGPACK_RUBY_ENCODING
#ifdef COMPAT_HAVE_ENCODING
ENCODING_SET(*o, s_enc_utf8);
#endif
return 0;
@@ -155,17 +155,11 @@ static inline int template_callback_raw(unpack_user* u, const char* b, const cha
rb_raise(rb_eTypeError, "instance of String needed"); \
}
#ifdef RUBY_VM
#define RERAISE rb_exc_raise(rb_errinfo())
#else
#define RERAISE rb_exc_raise(ruby_errinfo)
#endif
static VALUE template_execute_rescue(VALUE nouse)
{
rb_gc_enable();
RERAISE;
COMPAT_RERAISE;
}
static VALUE template_execute_do(VALUE argv)