diff options
author | Karl Williamson <khw@cpan.org> | 2018-04-20 10:59:40 -0600 |
---|---|---|
committer | Karl Williamson <khw@cpan.org> | 2018-06-25 07:33:27 -0600 |
commit | a473e849c311ec8884aae005ad111fe5e34d7255 (patch) | |
tree | e76deb2183b0b5fddd3f8e21f01193e062583b35 | |
parent | f7b69ff871416411ed69f6d37e77eb5e4d599ac6 (diff) | |
download | perl-a473e849c311ec8884aae005ad111fe5e34d7255.tar.gz |
regen/mk_invlists.pl: uni_keywords.c no longer exists
So no need to do an #ifdef for it.
-rw-r--r-- | charclass_invlists.h | 10 | ||||
-rw-r--r-- | regen/mk_invlists.pl | 4 | ||||
-rw-r--r-- | uni_keywords.h | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/charclass_invlists.h b/charclass_invlists.h index 3603c52370..3ce7a0d058 100644 --- a/charclass_invlists.h +++ b/charclass_invlists.h @@ -372227,10 +372227,6 @@ const char * deprecated_property_msgs[] = { "Supplanted by Line_Break property values; see www.unicode.org/reports/tr14" }; -#endif /* defined(PERL_IN_UTF8_C) */ - -#if defined(PERL_IN_UNI_KEYWORDS_C) || defined(PERL_IN_UTF8_C) - #define PL_HYPHEN (PL_HYPHEN_perl_aux + (MAX_UNI_KEYWORD_INDEX * 2)) #define PL_LB__SG (PL_LB__SG_perl_aux + (MAX_UNI_KEYWORD_INDEX * 1)) @@ -373352,10 +373348,6 @@ typedef enum { #define MAX_UNI_KEYWORD_INDEX PL__PERL_QUOTEMETA -#endif /* defined(PERL_IN_UNI_KEYWORDS_C) || defined(PERL_IN_UTF8_C) */ - -#if defined(PERL_IN_UTF8_C) - static const UV * const PL_uni_prop_ptrs[] = { NULL, /* Placeholder */ PL_ADLM_invlist, @@ -374653,5 +374645,5 @@ static const U8 WB_table[24][24] = { * 21653d2744fdd071f9ef138c805393901bb9547cf3e777ebf50215a191f986ea lib/unicore/version * 913d2f93f3cb6cdf1664db888bf840bc4eb074eef824e082fceda24a9445e60c regen/charset_translations.pl * 03e51b0f07beebd5da62ab943899aa4934eee1f792fa27c1fb638c33bf4ac6ea regen/mk_PL_charclass.pl - * 60fbfb560ee8628828613c067f2a9e26fb051a009608f69b6a6b361edbdd2bab regen/mk_invlists.pl + * 232d95d2479300926c29d5ed849bcec7d02f36f80f06578849584a064a0cc967 regen/mk_invlists.pl * ex: set ro: */ diff --git a/regen/mk_invlists.pl b/regen/mk_invlists.pl index 24c5e4f2be..a5eecaefbc 100644 --- a/regen/mk_invlists.pl +++ b/regen/mk_invlists.pl @@ -2668,9 +2668,7 @@ print $out_fh "\nconst char * deprecated_property_msgs[] = {\n\t"; print $out_fh join ",\n\t", map { "\"$_\"" } @deprecated_messages; print $out_fh "\n};\n"; -switch_pound_if ('binary_property_tables', [ 'PERL_IN_UTF8_C', - 'PERL_IN_UNI_KEYWORDS_C', - ]); +switch_pound_if ('binary_property_tables', 'PERL_IN_UTF8_C'); my @enums = sort values %enums; diff --git a/uni_keywords.h b/uni_keywords.h index 712bc9404d..3c0c8a92f2 100644 --- a/uni_keywords.h +++ b/uni_keywords.h @@ -6758,6 +6758,6 @@ MPH_VALt match_uniprop( const unsigned char * const key, const U16 key_len ) { * 21653d2744fdd071f9ef138c805393901bb9547cf3e777ebf50215a191f986ea lib/unicore/version * 913d2f93f3cb6cdf1664db888bf840bc4eb074eef824e082fceda24a9445e60c regen/charset_translations.pl * 03e51b0f07beebd5da62ab943899aa4934eee1f792fa27c1fb638c33bf4ac6ea regen/mk_PL_charclass.pl - * 60fbfb560ee8628828613c067f2a9e26fb051a009608f69b6a6b361edbdd2bab regen/mk_invlists.pl + * 232d95d2479300926c29d5ed849bcec7d02f36f80f06578849584a064a0cc967 regen/mk_invlists.pl * 784929499a354028e04efcff331847d420beeca7f3f4f22569b59ec160924b72 regen/mph.pl * ex: set ro: */ |