diff options
author | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
---|---|---|
committer | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
commit | 9297468fa579836e3a6a381b798feb6b78217c2d (patch) | |
tree | 53168212f427afbcf0693b534530a4af803152e9 /system/icu/checkimpl.patch | |
parent | a63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff) | |
parent | da5a69b65a8791fffa6e93366ee585f87eff136d (diff) | |
download | packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2 packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip |
Merge branch 'master' into zfs
Diffstat (limited to 'system/icu/checkimpl.patch')
-rw-r--r-- | system/icu/checkimpl.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/system/icu/checkimpl.patch b/system/icu/checkimpl.patch deleted file mode 100644 index 53cfa724f..000000000 --- a/system/icu/checkimpl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8baff8f03e07d8e02304d0c888d0bb21ad2eeb01 Mon Sep 17 00:00:00 2001 -From: Jeff Genovy <29107334+jefgen@users.noreply.github.com> -Date: Wed, 17 Oct 2018 19:47:35 -0700 -Subject: [PATCH] ICU-20208 uspoof.cpp function checkImpl should be static, - regenerate urename.h - -(cherry picked from commit 9ec2c332c1c9156323944ea2b15c2b91952efae4) ---- - common/unicode/urename.h | 1 - - i18n/uspoof.cpp | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/common/unicode/urename.h b/common/unicode/urename.h -index 5812173e39c..0512be3b6e5 100644 ---- a/common/unicode/urename.h -+++ b/common/unicode/urename.h -@@ -110,7 +110,6 @@ - #define _UTF7Data U_ICU_ENTRY_POINT_RENAME(_UTF7Data) - #define _UTF8Data U_ICU_ENTRY_POINT_RENAME(_UTF8Data) - #define allowedHourFormatsCleanup U_ICU_ENTRY_POINT_RENAME(allowedHourFormatsCleanup) --#define checkImpl U_ICU_ENTRY_POINT_RENAME(checkImpl) - #define cmemory_cleanup U_ICU_ENTRY_POINT_RENAME(cmemory_cleanup) - #define dayPeriodRulesCleanup U_ICU_ENTRY_POINT_RENAME(dayPeriodRulesCleanup) - #define deleteAllowedHourFormats U_ICU_ENTRY_POINT_RENAME(deleteAllowedHourFormats) -diff --git a/i18n/uspoof.cpp b/i18n/uspoof.cpp -index 8e3d69ede2b..66f228f037a 100644 ---- a/i18n/uspoof.cpp -+++ b/i18n/uspoof.cpp -@@ -547,7 +547,7 @@ uspoof_checkUnicodeString(const USpoofChecker *sc, - return uspoof_check2UnicodeString(sc, id, NULL, status); - } - --int32_t checkImpl(const SpoofImpl* This, const UnicodeString& id, CheckResult* checkResult, UErrorCode* status) { -+static int32_t checkImpl(const SpoofImpl* This, const UnicodeString& id, CheckResult* checkResult, UErrorCode* status) { - U_ASSERT(This != NULL); - U_ASSERT(checkResult != NULL); - checkResult->clear(); |