organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-10557 Fix some zOS build errors caused by missing exports and pthread macros

Browse source 
X-SVN-Rev: 34733
This commit is contained in:
Michael Ow 2013-12-10 18:10:44 +00:00
parent e0b70a15da
commit 1f1a501cd1
6 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
icu4c/source/common/uinit.cpp
View file

@ -55,6 +55,7 @@ initData(UErrorCode &status)
ucln_common_registerCleanup(UCLN_COMMON_UINIT, uinit_cleanup);
}
U_NAMESPACE_END
/*
* ICU Initialization Function. Need not be called.
*/
@ -64,5 +65,3 @@ u_init(UErrorCode *status) {
umtx_initOnce(gICUInitOnce, &initData, *status);
UTRACE_EXIT_STATUS(*status);
}
U_NAMESPACE_END

4
icu4c/source/common/unames.cpp
View file

@ -1440,6 +1440,8 @@ calcNameSetsLengths(UErrorCode *pErrorCode) {
return TRUE;
}
U_NAMESPACE_END
/* public API --------------------------------------------------------------- */
U_CAPI int32_t U_EXPORT2
@ -2086,8 +2088,6 @@ uchar_swapNames(const UDataSwapper *ds,
return headerSize+(int32_t)offset;
}
U_NAMESPACE_END
/*
* Hey, Emacs, please set the following:
*

2
icu4c/source/common/unicode/locid.h
View file

@ -748,7 +748,7 @@ private:
/**
* @internal
*/
friend void locale_available_init();
friend void U_CALLCONV locale_available_init();
};
inline UBool

4
icu4c/source/common/unicode/uniset.h
View file

@ -23,7 +23,7 @@
U_NAMESPACE_BEGIN
// Forward Declarations.
void UnicodeSet_initInclusion(int32_t src, UErrorCode &status); /**< @internal */
void U_CALLCONV UnicodeSet_initInclusion(int32_t src, UErrorCode &status); /**< @internal */
class BMPSet;
class ParsePosition;
@ -1589,7 +1589,7 @@ private:
UnicodeString& rebuiltPat,
UErrorCode& ec);
friend void UnicodeSet_initInclusion(int32_t src, UErrorCode &status);
friend void U_CALLCONV UnicodeSet_initInclusion(int32_t src, UErrorCode &status);
static const UnicodeSet* getInclusions(int32_t src, UErrorCode &status);
/**

2
icu4c/source/config/mh-os390
View file

@ -48,7 +48,7 @@ ICU_IEEE = -Wc,'FLOAT(IEEE)' -DIEEE_754=0#M#
endif
## Additional flags when building libraries and with threads
THREADSCPPFLAGS = -D_OPEN_THREADS
THREADSCPPFLAGS = -D_OPEN_THREADS=3
# For a dynamically called DLL module to share access to the POSIX external
# variables, with its caller, the DLL module must define these _SHR_* macros.

4
icu4c/source/i18n/unicode/gender.h
View file

@ -29,7 +29,7 @@ class GenderInfoTest;
U_NAMESPACE_BEGIN
// Forward Declaration
void GenderInfo_initCache(UErrorCode &status);
void U_CALLCONV GenderInfo_initCache(UErrorCode &status);
/**
* GenderInfo computes the gender of a list as a whole given the gender of
@ -100,7 +100,7 @@ private:
static const GenderInfo* loadInstance(const Locale& locale, UErrorCode& status);
friend class ::GenderInfoTest;
friend void GenderInfo_initCache(UErrorCode &status);
friend void U_CALLCONV GenderInfo_initCache(UErrorCode &status);
};
U_NAMESPACE_END