diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | include/ruby/encoding.h | 8 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Sun Mar 15 11:15:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/ruby.h ({RSTRING,RBIGNUM}_EMBED_LEN_MAX): made int. + + * include/ruby/ruby.h (OBJ_{TAINTED,UNTRUSTED,FROZEN}): return int. + + * include/ruby/encoding.h (ENC_CODERANGE): ditto. + Sun Mar 15 11:11:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_hash_uint, rb_hash_start, rb_hash_end): use VALUE diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index c74910dd9c..db85d4a39a 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -42,11 +42,11 @@ #define ENCODING_MAXNAMELEN 42 -#define ENC_CODERANGE_MASK (FL_USER8|FL_USER9) +#define ENC_CODERANGE_MASK ((int)(FL_USER8|FL_USER9)) #define ENC_CODERANGE_UNKNOWN 0 -#define ENC_CODERANGE_7BIT FL_USER8 -#define ENC_CODERANGE_VALID FL_USER9 -#define ENC_CODERANGE_BROKEN (FL_USER8|FL_USER9) +#define ENC_CODERANGE_7BIT ((int)FL_USER8) +#define ENC_CODERANGE_VALID ((int)FL_USER9) +#define ENC_CODERANGE_BROKEN ((int)(FL_USER8|FL_USER9)) #define ENC_CODERANGE(obj) (RBASIC(obj)->flags & ENC_CODERANGE_MASK) #define ENC_CODERANGE_ASCIIONLY(obj) (ENC_CODERANGE(obj) == ENC_CODERANGE_7BIT) #define ENC_CODERANGE_SET(obj,cr) (RBASIC(obj)->flags = \ |