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-12 corrected errors due to merging

Browse source 
X-SVN-Rev: 474
This commit is contained in:
Vladimir Weinstein 1999-12-29 00:18:52 +00:00
parent 8b20f17f49
commit 7f73adbf34
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
icu4c/source/common/uloc.c
View file

@ -318,7 +318,6 @@ uloc_getLanguage(const char* localeID,
{
language[uprv_min(i,languageCapacity-1)] = '\0';
}
}
return i+1;
}

5
icu4c/source/test/cintltst/cbiditst.c
View file

@ -237,11 +237,8 @@ testReordering(UBiDi *pBiDi, int testNumber) {
ubidi_invertMap(visualMap1, logicalMap2, length);
/* get them from the levels array, too */
<<<<<<< cbiditst.c
uprv_memcpy(levels, ubidi_getLevels(pBiDi, &errorCode), length);
=======
memcpy(levels, ubidi_getLevels(pBiDi, &errorCode), length);
>>>>>>> 1.7
if(U_FAILURE(errorCode)) {
log_err("ubidi_getLevels(tests[%d]): error %s\n", testNumber, myErrorName(errorCode));
return;