ICU-8784 iSeries updates - passes on iSeries!

X-SVN-Rev: 30675

diff --git a/icu4c/source/common/putil.cpp b/icu4c/source/common/putil.cpp
index 48fa80cecd11800ba181d5687d40d2fe8116191a..f0b0d46c90282e4847a9a6198140e788c5fd58a0 100644 (file)
--- a/icu4c/source/common/putil.cpp
+++ b/icu4c/source/common/putil.cpp
@@ -134,8 +134,13 @@
 #if defined(U_HAVE_ICUCFG)
 #   include "icucfg.h"
 #elif U_PLATFORM_IMPLEMENTS_POSIX
-#   define HAVE_DLFCN_H 1
-#   define HAVE_DLOPEN 1
+#   if U_PLATFORM == U_PF_OS400
+#    undef HAVE_DLFCN_H 1
+#    undef HAVE_DLOPEN 1
+#   else
+#    define HAVE_DLFCN_H 1
+#    define HAVE_DLOPEN 1
+#   endif
 #   define HAVE_GETTIMEOFDAY 1
 #else
 #   undef HAVE_DLFCN_H

diff --git a/icu4c/source/common/putilimp.h b/icu4c/source/common/putilimp.h
index d6b857501f429d8775ea4aad06460468aa5b5ea8..39f2554c3fc40571e948cb71591cb4a8a2f8c0ed 100644 (file)
--- a/icu4c/source/common/putilimp.h
+++ b/icu4c/source/common/putilimp.h
@@ -63,6 +63,8 @@ typedef size_t uintptr_t;
     /* Use the predefined value. */
 #elif !U_HAVE_NL_LANGINFO_CODESET
 #   define U_NL_LANGINFO_CODESET -1
+#elif U_PLATFORM == U_PF_OS400
+   /* not defined */
 #else
 #   define U_NL_LANGINFO_CODESET CODESET
 #endif
@@ -71,6 +73,8 @@ typedef size_t uintptr_t;
     /* Use the predefined value. */
 #elif U_PLATFORM_USES_ONLY_WIN32_API
 #   define U_TZSET _tzset
+#elif U_PLATFORM == U_PF_OS400
+   /* not defined */
 #else
 #   define U_TZSET tzset
 #endif
@@ -81,6 +85,8 @@ typedef size_t uintptr_t;
 #   define U_TIMEZONE __timezone
 #elif U_PLATFORM_USES_ONLY_WIN32_API
 #   define U_TIMEZONE _timezone
+#elif U_PLATFORM == U_PF_OS400
+   /* not defined */
 #else
 #   define U_TIMEZONE timezone
 #endif
@@ -89,6 +95,8 @@ typedef size_t uintptr_t;
     /* Use the predefined value. */
 #elif U_PLATFORM_USES_ONLY_WIN32_API
 #   define U_TZNAME _tzname
+#elif U_PLATFORM == U_PF_OS400
+   /* not defined */
 #else
 #   define U_TZNAME tzname
 #endif
@@ -105,6 +113,8 @@ typedef size_t uintptr_t;
     /* Use the predefined value. */
 #elif U_PLATFORM_USES_ONLY_WIN32_API
 #   define U_HAVE_POPEN 0
+#elif U_PLATFORM == U_PF_OS400
+#   define U_HAVE_POPEN 0
 #else
 #   define U_HAVE_POPEN 1
 #endif