From aedb406d05190b67bf5fa92a651c5f6abefce05c Mon Sep 17 00:00:00 2001
From: Michael Ow <mow@svn.icu-project.org>
Date: Wed, 9 Sep 2009 18:29:55 +0000
Subject: [PATCH] ICU-3319 Fix cygwin renaming issue.

X-SVN-Rev: 26614
---
 icu4c/source/common/unicode/platform.h.in | 15 ++++++---------
 icu4c/source/common/unicode/pwin32.h      |  8 +++++++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/icu4c/source/common/unicode/platform.h.in b/icu4c/source/common/unicode/platform.h.in
index 5cf6c95c050..b9d4a4110c0 100644
--- a/icu4c/source/common/unicode/platform.h.in
+++ b/icu4c/source/common/unicode/platform.h.in
@@ -189,11 +189,6 @@
 #define U_DEFAULT_SHOW_DRAFT @U_DEFAULT_SHOW_DRAFT@
 #endif
 
-/* Define the library suffix in a C syntax. */
-#define U_HAVE_LIB_SUFFIX @U_HAVE_LIB_SUFFIX@
-#define U_LIB_SUFFIX_C_NAME @ICULIBSUFFIXCNAME@
-#define U_LIB_SUFFIX_C_NAME_STRING "@ICULIBSUFFIXCNAME@"
-
 /** @} */
 
 /*===========================================================================*/
@@ -338,12 +333,16 @@
 
 /** @} */
 
+#endif /* CYGWINMSVC */
+
 /*===========================================================================*/
 /* Custom function renaming                                                  */
 /*===========================================================================*/
-#ifndef U_HAVE_LIB_SUFFIX
+/* Define the library suffix in a C syntax. */
+# define U_LIB_SUFFIX_C_NAME @ICULIBSUFFIXCNAME@
+# define U_LIB_SUFFIX_C_NAME_STRING "@ICULIBSUFFIXCNAME@"
 # define U_HAVE_LIB_SUFFIX @U_HAVE_LIB_SUFFIX@
-#endif
+
 #if U_HAVE_LIB_SUFFIX
 # ifndef U_ICU_FUNCTION_RENAME
 /* Renaming pattern:    u_strcpy_41_suffix */
@@ -353,6 +352,4 @@
 # endif
 #endif
 
-#endif /* CYGWINMSVC */
-
 #endif
diff --git a/icu4c/source/common/unicode/pwin32.h b/icu4c/source/common/unicode/pwin32.h
index b728db791e8..703896de900 100644
--- a/icu4c/source/common/unicode/pwin32.h
+++ b/icu4c/source/common/unicode/pwin32.h
@@ -247,9 +247,15 @@ Intel can define _M_IX86 or _M_X64
 #endif
 
 /** @{ Define the library suffix in a C syntax. */
+#ifndef U_HAVE_LIB_SUFFIX
 #define U_HAVE_LIB_SUFFIX 0
-#define U_LIB_SUFFIX_C_NAME 
+#endif
+#ifndef U_LIB_SUFFIX_C_NAME
+#define U_LIB_SUFFIX_C_NAME
+#endif
+#ifndef U_LIB_SUFFIX_C_NAME_STRING
 #define U_LIB_SUFFIX_C_NAME_STRING ""
+#endif
 /** @} */
 
 /*===========================================================================*/