diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-03 00:38:55 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-03 00:38:55 +0000 |
commit | c008ca5ae693c8a14bb8ed5c132575a628b7471d (patch) | |
tree | d681194bf7b87a273dac2c52b9f75b06254dbfda | |
parent | 8f84a1f537a4356bf3f66f516e6e6339007204b4 (diff) | |
download | ruby-c008ca5ae693c8a14bb8ed5c132575a628b7471d.tar.gz |
* include/ruby/encoding.h (rb_enc_step_back): cast 4th argument 'n'
as int because Ruby usually treats length value as long but
onigenc_step_back's 4th argument is int.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | include/ruby/encoding.h | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Feb 2 20:25:04 2011 NARUSE, Yui <naruse@ruby-lang.org> + + * include/ruby/encoding.h (rb_enc_step_back): cast 4th argument 'n' + as int because Ruby usually treats length value as long but + onigenc_step_back's 4th argument is int. + Thu Feb 3 07:20:46 2011 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/lib/psych/visitors/to_ruby.rb: use Regexp::NOENCODING diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 94953c0906..bb86e86aac 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -162,7 +162,7 @@ int rb_enc_codelen(int code, rb_encoding *enc); /* start, ptr, end, encoding -> next_char */ #define rb_enc_left_char_head(s,p,e,enc) (char *)onigenc_get_left_adjust_char_head(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e)) #define rb_enc_right_char_head(s,p,e,enc) (char *)onigenc_get_right_adjust_char_head(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e)) -#define rb_enc_step_back(s,p,e,n,enc) (char *)onigenc_step_back(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e),(n)) +#define rb_enc_step_back(s,p,e,n,enc) (char *)onigenc_step_back(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e),(int)(n)) /* ptr, ptr, encoding -> newline_or_not */ #define rb_enc_is_newline(p,end,enc) ONIGENC_IS_MBC_NEWLINE(enc,(UChar*)(p),(UChar*)(end)) |