diff options
Diffstat (limited to 'include/ruby/oniguruma.h')
| -rw-r--r-- | include/ruby/oniguruma.h | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h index 523fc7089a..1d8a0198d8 100644 --- a/include/ruby/oniguruma.h +++ b/include/ruby/oniguruma.h @@ -128,20 +128,15 @@ typedef unsigned int OnigCaseFoldType; /* case fold flag */ ONIG_EXTERN OnigCaseFoldType OnigDefaultCaseFoldFlag; -#define ONIG_CASE_MAPPING - -#ifdef ONIG_CASE_MAPPING /* bits for actual code point count; 3 bits is more than enough, currently only 2 used */ #define OnigCodePointMaskWidth 3 #define OnigCodePointMask ((1<<OnigCodePointMaskWidth)-1) #define OnigCodePointCount(n) ((n)&OnigCodePointMask) #define OnigCaseFoldFlags(n) ((n)&~OnigCodePointMask) -#endif /* ONIG_CASE_MAPPING */ /* #define ONIGENC_CASE_FOLD_HIRAGANA_KATAKANA (1<<1) */ /* no longer usable with these values! */ /* #define ONIGENC_CASE_FOLD_KATAKANA_WIDTH (1<<2) */ /* no longer usable with these values! */ -#ifdef ONIG_CASE_MAPPING /* bits for index into table with separate titlecase mappings */ /* 10 bits provide 1024 values */ #define OnigSpecialIndexShift 3 @@ -155,15 +150,12 @@ ONIG_EXTERN OnigCaseFoldType OnigDefaultCaseFoldFlag; #define ONIGENC_CASE_DOWN_SPECIAL (1<<17) /* has special downcase mapping */ #define ONIGENC_CASE_MODIFIED (1<<18) /* data has been modified */ #define ONIGENC_CASE_FOLD (1<<19) /* has/needs case folding */ -#endif /* ONIG_CASE_MAPPING */ #define ONIGENC_CASE_FOLD_TURKISH_AZERI (1<<20) /* needs mapping specific to Turkic languages; better not change original value! */ -#ifdef ONIG_CASE_MAPPING #define ONIGENC_CASE_FOLD_LITHUANIAN (1<<21) /* needs Lithuanian-specific mapping */ #define ONIGENC_CASE_ASCII_ONLY (1<<22) /* only modify ASCII range */ #define ONIGENC_CASE_IS_TITLECASE (1<<23) /* character itself is already titlecase */ -#endif /* ONIG_CASE_MAPPING */ #define INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR (1<<30) /* better not change original value! */ @@ -216,9 +208,7 @@ typedef struct OnigEncodingTypeST { int (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* end, const struct OnigEncodingTypeST* enc); int ruby_encoding_index; unsigned int flags; -#ifdef ONIG_CASE_MAPPING int (*case_map)(OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc); -#endif /* ONIG_CASE_MAPPING */ } OnigEncodingType; typedef const OnigEncodingType* OnigEncoding; @@ -229,13 +219,11 @@ ONIG_EXTERN const OnigEncodingType OnigEncodingASCII; #define ONIG_ENCODING_UNDEF ((OnigEncoding )0) -#ifdef ONIG_CASE_MAPPING - /* this declaration needs to be here because it is used in string.c */ - ONIG_EXTERN int onigenc_ascii_only_case_map P_((OnigCaseFoldType* flagP, - const OnigUChar** pp, const OnigUChar* end, - OnigUChar* to, OnigUChar* to_end, - const struct OnigEncodingTypeST* enc)); -#endif /* ONIG_CASE_MAPPING */ +/* this declaration needs to be here because it is used in string.c */ +ONIG_EXTERN int onigenc_ascii_only_case_map P_((OnigCaseFoldType* flagP, + const OnigUChar** pp, const OnigUChar* end, + OnigUChar* to, OnigUChar* to_end, + const struct OnigEncodingTypeST* enc)); /* work size */ |