summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharliesome <charliesome@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-11 04:23:12 +0000
committercharliesome <charliesome@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-11 04:23:12 +0000
commitdc548ba04e468824edc3b4fe3210ae12c10f6100 (patch)
tree8b7b3788a682499a4a5fc27ce012080a3481648d
parentbf2ed9633900d3b6ad4f2696bd283db9e6205b4b (diff)
* include/ruby/encoding.h: Reduce ENCODING_INLINE_MAX to 127 as this
should be sufficient to represent all the encodings Ruby supports. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/encoding.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b65afdda672..73e1f9e0941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 11 13:17:00 2013 Charlie Somerville <charliesome@ruby-lang.org>
+
+ * include/ruby/encoding.h: Reduce ENCODING_INLINE_MAX to 127 as this
+ should be sufficient to represent all the encodings Ruby supports.
+
Sun Aug 11 11:54:38 2013 Tanaka Akira <akr@fsij.org>
* process.c (rb_clock_gettime): New method.
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 847d7dd8102..3db70acaf37 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -24,9 +24,9 @@ extern "C" {
RUBY_SYMBOL_EXPORT_BEGIN
-#define ENCODING_INLINE_MAX 1023
+#define ENCODING_INLINE_MAX 127
#define ENCODING_SHIFT (FL_USHIFT+10)
-#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_MASK (((VALUE)ENCODING_INLINE_MAX)<<ENCODING_SHIFT) /* FL_USER10|FL_USER11|FL_USER12|FL_USER13|FL_USER14|FL_USER15|FL_USER16 */
#define ENCODING_SET_INLINED(obj,i) do {\
RBASIC(obj)->flags &= ~ENCODING_MASK;\