organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-4287 Fix various issues with non-MSVC6 compilers.

Browse source 
X-SVN-Rev: 17068
This commit is contained in:
George Rhoten 2005-01-01 04:23:18 +00:00
parent 8dae6168aa
commit c8dc6ff820
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/Makefile.in
View file

@ -69,7 +69,7 @@ ucnvmbcs.o ucnv2022.o ucnvhz.o ucnv_lmb.o ucnvisci.o ucnvdisp.o \
unistr.o unistr_case.o unistr_cnv.o unistr_props.o \
utf_impl.o ustring.o ustr_cnv.o ustrcase.o cstring.o ustrfmt.o ustrtrns.o ustr_wcs.o uinvchar.o \
normlzr.o unorm.o unormcmp.o unorm_it.o chariter.o schriter.o uchriter.o uiter.o \
uchar.o uprops.o ucase.o propname.o ubidi.o ubidiwrt.o ubidiln.o ushape.o unames.o \
uchar.o uprops.o ucase.o propname.o ubidi_props.o ubidi.o ubidiwrt.o ubidiln.o ushape.o unames.o \
uscript.o usc_impl.o uvector.o ustack.o uvectr32.o ucmp8.o \
uarrsort.o utrie.o uset.o uset_props.o uniset.o uniset_props.o ruleiter.o caniter.o unifilt.o unifunct.o usetiter.o \
brkiter.o brkdict.o ubrk.o dbbi.o dbbi_tbl.o \

2
icu4c/source/common/sprpimpl.h
View file

@ -88,7 +88,7 @@ struct UStringPrepProfile{
UTrie sprepTrie;
const uint16_t* mappingData;
UDataMemory* sprepData;
UBiDiProps *bdp; // used only if checkBiDi is set
UBiDiProps *bdp; /* used only if checkBiDi is set */
UBool isDataLoaded;
int32_t refCount;
UBool doNFKC;

5
icu4c/source/common/uprops.c
View file

@ -162,7 +162,7 @@ u_hasBinaryProperty(UChar32 c, UProperty which) {
U_CAPI int32_t U_EXPORT2
u_getIntPropertyValue(UChar32 c, UProperty which) {
UErrorCode errorCode;
UErrorCode errorCode=U_ZERO_ERROR;
if(which<UCHAR_BINARY_START) {
return 0; /* undefined */
@ -190,7 +190,6 @@ u_getIntPropertyValue(UChar32 c, UProperty which) {
return (int32_t)u_charType(c);
case UCHAR_JOINING_GROUP:
{
UErrorCode errorCode=U_ZERO_ERROR;
UBiDiProps *bdp=ubidi_getSingleton(&errorCode);
if(bdp!=NULL) {
return ubidi_getJoiningGroup(bdp, c);
@ -200,7 +199,6 @@ u_getIntPropertyValue(UChar32 c, UProperty which) {
}
case UCHAR_JOINING_TYPE:
{
UErrorCode errorCode=U_ZERO_ERROR;
UBiDiProps *bdp=ubidi_getSingleton(&errorCode);
if(bdp!=NULL) {
return ubidi_getJoiningType(bdp, c);
@ -213,7 +211,6 @@ u_getIntPropertyValue(UChar32 c, UProperty which) {
case UCHAR_NUMERIC_TYPE:
return (int32_t)GET_NUMERIC_TYPE(u_getUnicodeProperties(c, -1));
case UCHAR_SCRIPT:
errorCode=U_ZERO_ERROR;
return (int32_t)uscript_getScript(c, &errorCode);
case UCHAR_HANGUL_SYLLABLE_TYPE:
return uchar_getHST(c);