ICU-8452 Fix some Cygwin GCC and MinGW build errors

X-SVN-Rev: 30457

diff --git a/icu4c/source/common/putilimp.h b/icu4c/source/common/putilimp.h
index 4d92acd35a201f61001915d09159d418d1d2ca06..40cb6cf3e5bcf9ca264c932f5ebc37806146f900 100644 (file)
--- a/icu4c/source/common/putilimp.h
+++ b/icu4c/source/common/putilimp.h
@@ -103,7 +103,7 @@ typedef size_t uintptr_t;
 
 #ifdef U_HAVE_POPEN
     /* Use the predefined value. */
-#elif U_PLATFORM_HAS_WIN32_API
+#elif U_PLATFORM == U_PF_WINDOWS
 #   define U_HAVE_POPEN 0
 #else
 #   define U_HAVE_POPEN 1

diff --git a/icu4c/source/common/unicode/platform.h b/icu4c/source/common/unicode/platform.h
index 2d2c6dace170fd7bc018635d9f243725cffda2f6..5fab7ba6a1a63bc54555b40d94389baa22f68b7a 100644 (file)
--- a/icu4c/source/common/unicode/platform.h
+++ b/icu4c/source/common/unicode/platform.h
@@ -185,7 +185,11 @@
 #ifdef U_PLATFORM_HAS_WIN32_API
     /* Use the predefined value. */
 #elif U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN
-#   define U_PLATFORM_HAS_WIN32_API 1
+#   if U_PLATFORM == U_PF_CYGWIN && defined(__GNUC__)
+#       define U_PLATFORM_HAS_WIN32_API 0
+#   else
+#       define U_PLATFORM_HAS_WIN32_API 1
+#   endif
 #else
 #   define U_PLATFORM_HAS_WIN32_API 0
 #endif
@@ -504,7 +508,7 @@
      * Newer Mac OS X has size 4.
      */
 #   define U_SIZEOF_WCHAR_T 1
-#elif U_PLATFORM_HAS_WIN32_API
+#elif U_PLATFORM_HAS_WIN32_API || U_PLATFORM == U_PF_CYGWIN
 #   define U_SIZEOF_WCHAR_T 2
 #elif U_PLATFORM == U_PF_AIX
     /*

diff --git a/icu4c/source/tools/pkgdata/pkgdata.cpp b/icu4c/source/tools/pkgdata/pkgdata.cpp
index a7125717d6f3ad30992efe61401948d440b7f14a..f237fe44322173aa7fd9ff083de3334d470c13f6 100644 (file)
--- a/icu4c/source/tools/pkgdata/pkgdata.cpp
+++ b/icu4c/source/tools/pkgdata/pkgdata.cpp
@@ -20,14 +20,16 @@
 
 #include "unicode/utypes.h"
 
+#include "unicode/putil.h"
+#include "putilimp.h"
+
 #if U_HAVE_POPEN
-#if (U_PF_MINGW <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__)
+#if (U_PF_MINGW <= U_PLATFORM || U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__)
 /* popen/pclose aren't defined in strict ANSI on Cygwin and MinGW */
 #undef __STRICT_ANSI__
 #endif
 #endif
 
-#include "unicode/putil.h"
 #include "cmemory.h"
 #include "cstring.h"
 #include "filestrm.h"
@@ -35,7 +37,6 @@
 #include "unicode/uclean.h"
 #include "unewdata.h"
 #include "uoptions.h"
-#include "putilimp.h"
 #include "package.h"
 #include "pkg_icu.h"
 #include "pkg_genc.h"