summaryrefslogtreecommitdiff
path: root/internal.h
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-05 04:21:30 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-05 04:21:30 +0000
commit38cd45a3cdacf6d0bea95e3da41d7ae09da90fb7 (patch)
treeacfb06f0455fe54f37b046463cd189b2ba7df79b /internal.h
parent84d8104ed6b2a6020e8c142a2cc759beb4b3d4a9 (diff)
* internal.h: remove macros STR_NOCAPA and STR_NOCAPA_P().
* string.c (rb_str_resize): remove `STR_SET_NOEMBED(str)' because str_make_independent_expand() set NOEMBED flag. * string.c (rb_str_resize): remove `STR_NOCAPA_P(str)' check because `str' is independent (not shared). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'internal.h')
-rw-r--r--internal.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/internal.h b/internal.h
index 3a6cb240b6..ddb59d64b3 100644
--- a/internal.h
+++ b/internal.h
@@ -717,10 +717,8 @@ VALUE rb_external_str_with_enc(VALUE str, rb_encoding *eenc);
#endif
#define STR_NOEMBED FL_USER1
#define STR_SHARED FL_USER2 /* = ELTS_SHARED */
-#define STR_NOCAPA (STR_NOEMBED|ELTS_SHARED)
#define STR_EMBED_P(str) (!FL_TEST((str), STR_NOEMBED))
-#define STR_SHARED_P(s) FL_ALL((s), STR_NOCAPA)
-#define STR_NOCAPA_P(s) FL_ALL((s), STR_NOCAPA)
+#define STR_SHARED_P(s) FL_ALL((s), STR_NOEMBED|ELTS_SHARED)
#define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT)
#define is_broken_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN)