From 1108b5a19bccf1f95188a56b9f562a2c8b8de9db Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Tue, 19 Jun 2018 18:20:38 -0400 Subject: [PATCH] Move class constant definition to the right enum file --- ext/intl/uchar/uchar.c | 2 -- ext/intl/uchar/uother-enum.h | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c index c3fe66f823c..10bfbc25c10 100644 --- a/ext/intl/uchar/uchar.c +++ b/ext/intl/uchar/uchar.c @@ -747,8 +747,6 @@ int php_uchar_minit(INIT_FUNC_ARGS) { zend_declare_class_constant_string(ce, "UNICODE_VERSION", sizeof("UNICODE_VERISON")-1, U_UNICODE_VERSION); IC_CONSTL("CODEPOINT_MIN", UCHAR_MIN_VALUE) IC_CONSTL("CODEPOINT_MAX", UCHAR_MAX_VALUE) - IC_CONSTL("FOLD_CASE_DEFAULT", U_FOLD_CASE_DEFAULT) - IC_CONSTL("FOLD_CASE_EXCLUDE_SPECIAL_I", U_FOLD_CASE_EXCLUDE_SPECIAL_I) zend_declare_class_constant_double(ce, "NO_NUMERIC_VALUE", sizeof("NO_NUMERIC_VALUE")-1, U_NO_NUMERIC_VALUE); /* All enums used by the uchar APIs. There are a LOT of them, diff --git a/ext/intl/uchar/uother-enum.h b/ext/intl/uchar/uother-enum.h index babcf5cb164..5e59b6bd361 100644 --- a/ext/intl/uchar/uother-enum.h +++ b/ext/intl/uchar/uother-enum.h @@ -282,3 +282,7 @@ UOTHER(HST_TRAILING_JAMO) UOTHER(HST_LV_SYLLABLE) UOTHER(HST_LVT_SYLLABLE) UOTHER(HST_COUNT ) + +/* StringOptions - http://icu-project.org/apiref/icu4c/stringoptions_8h.html */ +UOTHER(FOLD_CASE_DEFAULT) +UOTHER(FOLD_CASE_EXCLUDE_SPECIAL_I)