organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-09 15:27:38 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-8601 second try to fix build on platforms where UChar != uint16_t

Browse source 
X-SVN-Rev: 30154
This commit is contained in:
Markus Scherer 2011-05-27 17:54:37 +00:00
parent 7225bff0c5
commit 6a8a76e7c7
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
icu4c/source/common/ucase.cpp
View file

@ -335,7 +335,6 @@ strcmpMax(const UChar *s, int32_t length, const UChar *t, int32_t max) {
U_CFUNC UBool U_EXPORT2
ucase_addStringCaseClosure(const UCaseProps *csp, const UChar *s, int32_t length, const USetAdder *sa) {
const UChar *unfold, *p;
int32_t i, start, limit, result, unfoldRows, unfoldRowWidth, unfoldStringWidth;
if(csp->unfold==NULL || s==NULL) {
@ -352,7 +351,7 @@ ucase_addStringCaseClosure(const UCaseProps *csp, const UChar *s, int32_t length
return FALSE;
}
unfold=csp->unfold;
const uint16_t *unfold=csp->unfold;
unfoldRows=unfold[UCASE_UNFOLD_ROWS];
unfoldRowWidth=unfold[UCASE_UNFOLD_ROW_WIDTH];
unfoldStringWidth=unfold[UCASE_UNFOLD_STRING_WIDTH];
@ -368,7 +367,7 @@ ucase_addStringCaseClosure(const UCaseProps *csp, const UChar *s, int32_t length
limit=unfoldRows;
while(start<limit) {
i=(start+limit)/2;
p=unfold+(i*unfoldRowWidth);
const UChar *p=reinterpret_cast<const UChar *>(unfold+(i*unfoldRowWidth));
result=strcmpMax(s, length, p, unfoldStringWidth);
if(result==0) {