summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-15 02:15:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-15 02:15:19 +0000
commitafdeb2d35ec63079a37bffbc81b5e7c54760ee5d (patch)
tree46ab87d28447fa21eca340654af280a6d9dc7126
parent8c8f85ed4f82ab0671b5608d81327b8f51108afe (diff)
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22967 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--include/ruby/encoding.h8
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 21cdd131ed7..0d6a0653246 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 c74910dd9c1..db85d4a39ab 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 = \