ICU-9336 Add some fixes for build failures in z/OS

X-SVN-Rev: 31891

diff --git a/icu4c/source/common/putilimp.h b/icu4c/source/common/putilimp.h
index 3f097d3b8626249c204bd9a3ad8952df70a1225c..4684fd596c1341fd870ae6ea29bfe65ebc4a169d 100644 (file)
--- a/icu4c/source/common/putilimp.h
+++ b/icu4c/source/common/putilimp.h
@@ -65,7 +65,8 @@
  *
  * Do not use ptrdiff_t since it is signed. size_t is unsigned.
  */
-#if !defined(__intptr_t_defined) && !defined(UINTPTR_MAX)
+/* TODO: This check fails on some z environments. Filed a ticket #9357 for this. */
+#if !defined(__intptr_t_defined) && !defined(UINTPTR_MAX) && (U_PLATFORM != U_PF_OS390)
 typedef size_t uintptr_t;
 #endif
 

diff --git a/icu4c/source/tools/ctestfw/unicode/utimer.h b/icu4c/source/tools/ctestfw/unicode/utimer.h
index adf11381fc45389a3fe59876a157ad6202ecd980..605158b05ba33e0e77d30775639eb5c8c3c7707d 100644 (file)
--- a/icu4c/source/tools/ctestfw/unicode/utimer.h
+++ b/icu4c/source/tools/ctestfw/unicode/utimer.h
@@ -1,6 +1,6 @@
 /*
 ************************************************************************
-* Copyright (c) 1997-2011, International Business Machines
+* Copyright (c) 1997-2012, International Business Machines
 * Corporation and others.  All Rights Reserved.
 ************************************************************************
 */
@@ -15,7 +15,7 @@
 #   define WIN32_LEAN_AND_MEAN
 #   include <windows.h>
 #else
-#   if U_PLATFORM == U_PF_OS390
+#   if U_PLATFORM == U_PF_OS390 && !defined(__UU)
 #     define __UU  /* Universal Unix - for struct timeval */
 #   endif
 #   include <time.h>

diff --git a/icu4c/source/tools/pkgdata/pkgdata.cpp b/icu4c/source/tools/pkgdata/pkgdata.cpp
index 44c1a388d6bb94de3d15fe0f9676f77ef13cf6fc..c54d0cb52648ec7dc3dfed3682a774de3f8f888a 100644 (file)
--- a/icu4c/source/tools/pkgdata/pkgdata.cpp
+++ b/icu4c/source/tools/pkgdata/pkgdata.cpp
@@ -1575,7 +1575,7 @@ static int32_t pkg_createWithoutAssemblyCode(UPKGOptions *o, const char *targetD
     if (result == 0) {
         /* Generate the library file. */
 #if U_PLATFORM == U_PF_OS390
-        if (o->pdsbuild && mode == MODE_DLL) {
+        if (o->pdsbuild && IN_MODE_DLL(mode)) {
             result = pkg_generateLibraryFile("",mode, buffer, cmd);
         } else {
             result = pkg_generateLibraryFile(targetDir,mode, buffer, cmd);