diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-10 17:47:04 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-10 17:47:04 +0000 |
| commit | 2873edeafb6f6df1fc99bb9b1167591b99dd378c (patch) | |
| tree | deb58ca3dc6d6cd71c1740e62aa7e47bea5ed37e /enc/us_ascii.c | |
| parent | 42a677c895f82bcd611db2773fbe68b0558b142d (diff) | |
Merge Onigmo 6.0.0
* https://github.com/k-takata/Onigmo/blob/Onigmo-6.0.0/HISTORY
* fix for ruby 2.4: https://github.com/k-takata/Onigmo/pull/78
* suppress warning: https://github.com/k-takata/Onigmo/pull/79
* include/ruby/oniguruma.h: include onigmo.h.
* template/encdb.h.tmpl: ignore duplicated definition of EUC-CN in
enc/euc_kr.c. It is defined in enc/gb2313.c with CRuby macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc/us_ascii.c')
| -rw-r--r-- | enc/us_ascii.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/enc/us_ascii.c b/enc/us_ascii.c index cf835e6538..08f9072c43 100644 --- a/enc/us_ascii.c +++ b/enc/us_ascii.c @@ -1,7 +1,10 @@ #include "regenc.h" -#include "encindex.h" +#ifdef RUBY +# include "encindex.h" +#endif + #ifndef ENCINDEX_US_ASCII -#define ENCINDEX_US_ASCII 0 +# define ENCINDEX_US_ASCII 0 #endif static int @@ -29,9 +32,9 @@ OnigEncodingDefine(us_ascii, US_ASCII) = { onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match, + onigenc_single_byte_ascii_only_case_map, ENCINDEX_US_ASCII, ONIGENC_FLAG_NONE, - onigenc_single_byte_ascii_only_case_map, }; ENC_ALIAS("ASCII", "US-ASCII") ENC_ALIAS("ANSI_X3.4-1968", "US-ASCII") |