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

X-SVN-Rev: 34733

diff --git a/icu4c/source/common/uinit.cpp b/icu4c/source/common/uinit.cpp
index e97869b2db24df7c0e87b87322675d3c1e210251..19191f913ab82cbb74c8cbdefde1a794bd4557e7 100644 (file)
--- a/icu4c/source/common/uinit.cpp
+++ b/icu4c/source/common/uinit.cpp
@@ -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

diff --git a/icu4c/source/common/unames.cpp b/icu4c/source/common/unames.cpp
index 6a3e81c561df766abd045a701778522413a313d5..438f59cca39a500247071dc28f196de39aff2759 100644 (file)
--- a/icu4c/source/common/unames.cpp
+++ b/icu4c/source/common/unames.cpp
@@ -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:
  *

diff --git a/icu4c/source/common/unicode/locid.h b/icu4c/source/common/unicode/locid.h
index 0faea9b81f3babdf7a87b353b3bdbeabac83dc70..09ab5617a12b6a8bc149cc2db1565b3f035f93bf 100644 (file)
--- a/icu4c/source/common/unicode/locid.h
+++ b/icu4c/source/common/unicode/locid.h
@@ -748,7 +748,7 @@ private:
     /**
      * @internal
      */
-    friend void locale_available_init();
+    friend void U_CALLCONV locale_available_init();
 };
 
 inline UBool

diff --git a/icu4c/source/common/unicode/uniset.h b/icu4c/source/common/unicode/uniset.h
index a959fb971ba68df18abd85617e87b81b57f904c4..fa7cc7ca1c2cdc884884bc2c02cdacae475f7fe8 100644 (file)
--- a/icu4c/source/common/unicode/uniset.h
+++ b/icu4c/source/common/unicode/uniset.h
@@ -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);
 
     /**

diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390
index 056f89144367d494c12afa1e89373a2a6244c422..1a46550680672b641e30e030f17a1d7de614710a 100644 (file)
--- a/icu4c/source/config/mh-os390
+++ b/icu4c/source/config/mh-os390
@@ -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.

diff --git a/icu4c/source/i18n/unicode/gender.h b/icu4c/source/i18n/unicode/gender.h
index c7a0bd1965b3d8e6c4acc53ca1526d1ebf9efe39..1a6ae8fe6c8d4854f28d9e0a0289d75e1ab3c57a 100644 (file)
--- a/icu4c/source/i18n/unicode/gender.h
+++ b/icu4c/source/i18n/unicode/gender.h
@@ -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