aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcharliesome <charliesome@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-05 02:51:58 +0000
committercharliesome <charliesome@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-05 02:51:58 +0000
commitac93b2840388ba674915a6eb101710774eb52ec7 (patch)
tree77711c8439ba979cc7c3be49f156b7c38aaca40a
parent5e98991f1bf475cedff781e3ae2f2307c884f52d (diff)
downloadruby-ac93b2840388ba674915a6eb101710774eb52ec7.tar.gz
* include/ruby/encoding.h: document which user flags are used by
ENCODING_MASK for better greppability git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/encoding.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fb7efeca7..a3ca82130d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 5 11:51:00 2013 Charlie Somerville <charliesome@ruby-lang.org>
+
+ * include/ruby/encoding.h: document which user flags are used by
+ ENCODING_MASK for better greppability
+
Mon Aug 5 10:01:00 2013 Charlie Somerville <charliesome@ruby-lang.org>
* object.c (rb_class_inherited_p): allow iclasses to be tested for
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 62e9b6642d..847d7dd810 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -26,7 +26,7 @@ RUBY_SYMBOL_EXPORT_BEGIN
#define ENCODING_INLINE_MAX 1023
#define ENCODING_SHIFT (FL_USHIFT+10)
-#define ENCODING_MASK (((VALUE)ENCODING_INLINE_MAX)<<ENCODING_SHIFT)
+#define ENCODING_MASK (((VALUE)ENCODING_INLINE_MAX)<<ENCODING_SHIFT) /* FL_USER10|FL_USER11|FL_USER12|FL_USER13|FL_USER14|FL_USER15|FL_USER16|FL_USER17|FL_USER18|FL_USER19 */
#define ENCODING_SET_INLINED(obj,i) do {\
RBASIC(obj)->flags &= ~ENCODING_MASK;\