diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-30 15:25:26 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-30 15:25:26 +0000 |
| commit | 6908e4960d7cc6b271dcf70e87ce37104ce8ef5b (patch) | |
| tree | e598e7730112ae0458415792c290c0f2b56c143c /include/ruby/encoding.h | |
| parent | 0328cdf92cf392dccf1c9667b5006a497043bb85 (diff) | |
encoding.h: fix conflicts
* include/ruby/encoding.h (rb_{ascii8bit,utf8,usascii}_encindex): get
rid of conflict with macros defined in internal.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby/encoding.h')
| -rw-r--r-- | include/ruby/encoding.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 3db70acaf3..ebd9cfd262 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -197,9 +197,15 @@ rb_encoding *rb_locale_encoding(void); rb_encoding *rb_filesystem_encoding(void); rb_encoding *rb_default_external_encoding(void); rb_encoding *rb_default_internal_encoding(void); +#ifndef rb_ascii8bit_encindex int rb_ascii8bit_encindex(void); +#endif +#ifndef rb_utf8_encindex int rb_utf8_encindex(void); +#endif +#ifndef rb_usascii_encindex int rb_usascii_encindex(void); +#endif int rb_locale_encindex(void); int rb_filesystem_encindex(void); VALUE rb_enc_default_external(void); |