diff options
author | 卜部昌平 <shyouhei@ruby-lang.org> | 2022-09-16 15:14:05 +0900 |
---|---|---|
committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2022-09-21 11:44:09 +0900 |
commit | 45741918e1963fce3416b253712cfd4745368e7f (patch) | |
tree | 8c1563e91df0c162f0f811f9b1d985ed3c91617d /enc | |
parent | 77c61ae3ab51746c986ff853c85b5e05bc6a942b (diff) |
reserved_word: just use gperf 3.1 declaration
The reason why this was commented out was because of gperf 3.0 vs 3.1
differences (see [Feature #13883]). Five years passed, I am pretty
confident that we can drop support of old versions here.
Ditto for uniname2ctype_p(), onig_jis_property(), and zonetab().
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6358
Diffstat (limited to 'enc')
-rw-r--r-- | enc/jis/props.h.blt | 4 | ||||
-rw-r--r-- | enc/jis/props.kwd | 2 | ||||
-rw-r--r-- | enc/jis/props.src | 2 | ||||
-rw-r--r-- | enc/unicode/14.0.0/name2ctype.h | 6 |
4 files changed, 5 insertions, 9 deletions
diff --git a/enc/jis/props.h.blt b/enc/jis/props.h.blt index 54aa94f8bc..508a084449 100644 --- a/enc/jis/props.h.blt +++ b/enc/jis/props.h.blt @@ -69,7 +69,7 @@ struct enc_property { unsigned char ctype; }; -static const struct enc_property *onig_jis_property(/*const char *str, unsigned int len*/); +static const struct enc_property *onig_jis_property(register const char *str, register size_t len); #line 43 "enc/jis/props.kwd" struct enc_property; @@ -82,7 +82,7 @@ struct enc_property; #ifndef GPERF_DOWNCASE #define GPERF_DOWNCASE 1 -static unsigned char gperf_downcase[256] = +static const unsigned char gperf_downcase[256] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, diff --git a/enc/jis/props.kwd b/enc/jis/props.kwd index 659cf0aff4..9606828459 100644 --- a/enc/jis/props.kwd +++ b/enc/jis/props.kwd @@ -37,7 +37,7 @@ struct enc_property { unsigned char ctype; }; -static const struct enc_property *onig_jis_property(/*!ANSI{*/const char *str, unsigned int len/*}!ANSI*/); +static const struct enc_property *onig_jis_property(register const char *str, register size_t len); %} struct enc_property; diff --git a/enc/jis/props.src b/enc/jis/props.src index 659cf0aff4..9606828459 100644 --- a/enc/jis/props.src +++ b/enc/jis/props.src @@ -37,7 +37,7 @@ struct enc_property { unsigned char ctype; }; -static const struct enc_property *onig_jis_property(/*!ANSI{*/const char *str, unsigned int len/*}!ANSI*/); +static const struct enc_property *onig_jis_property(register const char *str, register size_t len); %} struct enc_property; diff --git a/enc/unicode/14.0.0/name2ctype.h b/enc/unicode/14.0.0/name2ctype.h index 99a3eeca19..61c16bafc2 100644 --- a/enc/unicode/14.0.0/name2ctype.h +++ b/enc/unicode/14.0.0/name2ctype.h @@ -40642,11 +40642,7 @@ struct uniname2ctype_struct { }; #define uniname2ctype_offset(str) offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_##str) -static const struct uniname2ctype_struct *uniname2ctype_p( -#if !(1+0) /* if ANSI, old style not to conflict with generated prototype */ - const char *, unsigned int -#endif -); +static const struct uniname2ctype_struct *uniname2ctype_p(register const char *str, register size_t len); #ifndef USE_UNICODE_PROPERTIES #define TOTAL_KEYWORDS 15 |