From ecae93acea39dea5e78ccdc278e98926669ade54 Mon Sep 17 00:00:00 2001
From: Michael Ow <mow@svn.icu-project.org>
Date: Fri, 2 Oct 2009 19:21:27 +0000
Subject: [PATCH] ICU-3319 Fix result check for uprv_memcmp and update
 namespace renaming

X-SVN-Rev: 26731
---
 icu4c/source/common/icudataver.c       | 2 +-
 icu4c/source/common/unicode/uvernum.h  | 2 +-
 icu4c/source/common/unicode/uversion.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/icu4c/source/common/icudataver.c b/icu4c/source/common/icudataver.c
index 2eea95fbfc8..51fe9ce9adc 100644
--- a/icu4c/source/common/icudataver.c
+++ b/icu4c/source/common/icudataver.c
@@ -64,7 +64,7 @@ U_CAPI UBool U_EXPORT2 u_isDataOlder(UVersionInfo dataVersionFillin, UBool *isMo
     if (U_SUCCESS(*status)) {
         u_versionFromString(wiredVersion, U_ICU_DATA_VERSION);
         
-        if (uprv_memcmp(dataVersion, wiredVersion, sizeof(UVersionInfo)) != -1) {
+        if (uprv_memcmp(dataVersion, wiredVersion, sizeof(UVersionInfo)) >= 0) {
             result = FALSE;
         }
         
diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h
index 263b00304a7..85f8004bb5e 100644
--- a/icu4c/source/common/unicode/uvernum.h
+++ b/icu4c/source/common/unicode/uvernum.h
@@ -55,7 +55,7 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.6
  */
-#define U_ICU_VERSION_SUFFIX _4_3
+#define U_ICU_VERSION_SUFFIX _43
 
 /** Glued version suffix function for renamers 
  *  This value will change in the subsequent releases of ICU.
diff --git a/icu4c/source/common/unicode/uversion.h b/icu4c/source/common/unicode/uversion.h
index 6888cb39e23..732627de79f 100644
--- a/icu4c/source/common/unicode/uversion.h
+++ b/icu4c/source/common/unicode/uversion.h
@@ -114,7 +114,7 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
 #       define U_ICU_NAMESPACE icu
         namespace U_ICU_NAMESPACE { }
 #   else
-#       define U_ICU_NAMESPACE icu_4_3
+#       define U_ICU_NAMESPACE U_ICU_ENTRY_POINT_RENAME(icu)
         namespace U_ICU_NAMESPACE { }
         namespace icu = U_ICU_NAMESPACE;
 #   endif