diff options
Diffstat (limited to 'encindex.h')
| -rw-r--r-- | encindex.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/encindex.h b/encindex.h index dcb1646f3a..e6ddb1b0c2 100644 --- a/encindex.h +++ b/encindex.h @@ -1,3 +1,5 @@ +#ifndef RUBY_ENCINDEX_H +#define RUBY_ENCINDEX_H 1 /********************************************************************** encindex.h - @@ -9,8 +11,7 @@ **********************************************************************/ -#ifndef RUBY_ENCINDEX_H -#define RUBY_ENCINDEX_H 1 +#include "ruby/encoding.h" /* rb_ascii8bit_encindex etc. */ #if defined(__cplusplus) extern "C" { #if 0 @@ -19,7 +20,7 @@ extern "C" { #endif enum ruby_preserved_encindex { - RUBY_ENCINDEX_ASCII, + RUBY_ENCINDEX_ASCII_8BIT, RUBY_ENCINDEX_UTF_8, RUBY_ENCINDEX_US_ASCII, @@ -39,7 +40,7 @@ enum ruby_preserved_encindex { RUBY_ENCINDEX_BUILTIN_MAX }; -#define ENCINDEX_ASCII RUBY_ENCINDEX_ASCII +#define ENCINDEX_ASCII_8BIT RUBY_ENCINDEX_ASCII_8BIT #define ENCINDEX_UTF_8 RUBY_ENCINDEX_UTF_8 #define ENCINDEX_US_ASCII RUBY_ENCINDEX_US_ASCII #define ENCINDEX_UTF_16BE RUBY_ENCINDEX_UTF_16BE @@ -53,10 +54,12 @@ enum ruby_preserved_encindex { #define ENCINDEX_Windows_31J RUBY_ENCINDEX_Windows_31J #define ENCINDEX_BUILTIN_MAX RUBY_ENCINDEX_BUILTIN_MAX -#define rb_ascii8bit_encindex() RUBY_ENCINDEX_ASCII +#define rb_ascii8bit_encindex() RUBY_ENCINDEX_ASCII_8BIT #define rb_utf8_encindex() RUBY_ENCINDEX_UTF_8 #define rb_usascii_encindex() RUBY_ENCINDEX_US_ASCII +int rb_enc_find_index2(const char *name, long len); + #if defined(__cplusplus) #if 0 { /* satisfy cc-mode */ |