ICU-8635 Update ICU4C version to 49.0.1 (49M1)

X-SVN-Rev: 30216

diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj
index 20f1cefd75d991725aa41650dae3126648698c20..e0484bd9867efc8b86607345efbdb695c71d75ee 100644 (file)
--- a/icu4c/source/common/common.vcxproj
+++ b/icu4c/source/common/common.vcxproj
@@ -104,7 +104,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icuuc48.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icuuc49.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib\icuuc.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -145,7 +145,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icuuc48d.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icuuc49d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib\icuucd.pdb</ProgramDatabaseFile>\r
@@ -183,7 +183,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icuuc48.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icuuc49.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib64\icuuc.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -222,7 +222,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icuuc48d.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icuuc49d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib64\icuucd.pdb</ProgramDatabaseFile>\r

diff --git a/icu4c/source/common/unicode/platform.h.in b/icu4c/source/common/unicode/platform.h.in
index b0f83b9a954bf6113f597d692725370ebeb2c7b9..466c8cae7c2a3abba190ada11d24bbb6c0198645 100644 (file)
--- a/icu4c/source/common/unicode/platform.h.in
+++ b/icu4c/source/common/unicode/platform.h.in
@@ -394,7 +394,7 @@
 # ifndef U_ICU_ENTRY_POINT_RENAME
 /* Renaming pattern:    u_strcpy_41_suffix */
 #  define U_ICU_ENTRY_POINT_RENAME(x)    x ## _ ## @LIB_VERSION_MAJOR@ ## @ICULIBSUFFIXCNAME@
-#  define U_DEF_ICUDATA_ENTRY_POINT(major, minor) icudt##@ICULIBSUFFIXCNAME@##major##minor##_dat
+#  define U_DEF_ICUDATA_ENTRY_POINT(major) icudt##@ICULIBSUFFIXCNAME@##major##_dat
 
 # endif
 #endif

diff --git a/icu4c/source/common/unicode/utypes.h b/icu4c/source/common/unicode/utypes.h
index 6b48fd2de1847c9e273481aadbc738dfe450b670..1face48bce459effff90f7e3bfc959d5107cf96e 100644 (file)
--- a/icu4c/source/common/unicode/utypes.h
+++ b/icu4c/source/common/unicode/utypes.h
@@ -254,20 +254,20 @@
  *                                  \#define U_ICU_ENTRY_POINT icudt19_dat
  * @stable ICU 2.4
  */
-#define U_ICUDATA_ENTRY_POINT  U_DEF2_ICUDATA_ENTRY_POINT(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM)
+#define U_ICUDATA_ENTRY_POINT  U_DEF2_ICUDATA_ENTRY_POINT(U_ICU_VERSION_MAJOR_NUM)
 
 /**
  * Do not use.
  * @internal
  */
-#define U_DEF2_ICUDATA_ENTRY_POINT(major, minor) U_DEF_ICUDATA_ENTRY_POINT(major, minor)
+#define U_DEF2_ICUDATA_ENTRY_POINT(major) U_DEF_ICUDATA_ENTRY_POINT(major)
 /**
  * Do not use.
  * @internal
  */
 #ifndef U_DEF_ICUDATA_ENTRY_POINT
 /* affected by symbol renaming. See platform.h */
-#define U_DEF_ICUDATA_ENTRY_POINT(major, minor) icudt##major##minor##_dat
+#define U_DEF_ICUDATA_ENTRY_POINT(major) icudt##major##_dat
 #endif
 
 /**

diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h
index 1edfa1cd82afdd2eb3a821de36d2bcaee9d23f7e..ef6a8b0cc0adc9030d5655db33736aad0a5bd686 100644 (file)
--- a/icu4c/source/common/unicode/uvernum.h
+++ b/icu4c/source/common/unicode/uvernum.h
@@ -42,25 +42,25 @@
  *  @stable ICU 2.4
  */
 #define U_COPYRIGHT_STRING \
-  " Copyright (C) 2010, International Business Machines Corporation and others. All Rights Reserved. "
+  " Copyright (C) 2011, International Business Machines Corporation and others. All Rights Reserved. "
 
 /** The current ICU major version as an integer. 
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.4
  */
-#define U_ICU_VERSION_MAJOR_NUM 4
+#define U_ICU_VERSION_MAJOR_NUM 49
 
 /** The current ICU minor version as an integer. 
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.6
  */
-#define U_ICU_VERSION_MINOR_NUM 8
+#define U_ICU_VERSION_MINOR_NUM 0
 
 /** The current ICU patchlevel version as an integer.  
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.4
  */
-#define U_ICU_VERSION_PATCHLEVEL_NUM 0
+#define U_ICU_VERSION_PATCHLEVEL_NUM 1
 
 /** The current ICU build level version as an integer.  
  *  This value is for use by ICU clients. It defaults to 0.
@@ -74,7 +74,7 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.6
  */
-#define U_ICU_VERSION_SUFFIX _48
+#define U_ICU_VERSION_SUFFIX _49
 
 /** Glued version suffix function for renamers 
  *  This value will change in the subsequent releases of ICU.
@@ -83,7 +83,7 @@
  *  @stable ICU 4.2
  */
 #ifndef U_ICU_ENTRY_POINT_RENAME
-#define U_ICU_ENTRY_POINT_RENAME(x)    x ## _48
+#define U_ICU_ENTRY_POINT_RENAME(x)    x ## _49
 #endif
 
 /** The current ICU library version as a dotted-decimal string. The patchlevel
@@ -91,18 +91,18 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.4
  */
-#define U_ICU_VERSION "4.8"
+#define U_ICU_VERSION "49.0.1"
 
 /** The current ICU library major/minor version as a string without dots, for library name suffixes. 
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.6
  */
-#define U_ICU_VERSION_SHORT "48"
+#define U_ICU_VERSION_SHORT "49"
 
 /** Data version in ICU4C.
  * @internal ICU 4.4 Internal Use Only
  **/
-#define U_ICU_DATA_VERSION "4.8"
+#define U_ICU_DATA_VERSION "49.0.1"
 
 /*===========================================================================
  * ICU collation framework version information

diff --git a/icu4c/source/configure b/icu4c/source/configure
index a30fcbefea4d47c3841344b9990601bd50085506..0e65e44832999963e0353fd12b43e89ae1892cb1 100755 (executable)
--- a/icu4c/source/configure
+++ b/icu4c/source/configure
@@ -2601,7 +2601,8 @@ fi
 # Compute a reasonable library version from the release version. This is
 # very bad, but that's wanted... We want to make sure that the LIB_VERSION
 # has at least a dot in it, so we'll add a .0 if needed.
-LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`
+#[LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`]
+LIB_VERSION=$VERSION
 LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`
 
 

diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in
index ae59b114e965522be1a982b73aea40c936de44a9..b3341ca17e939aa6b15fec5959411bc04ad086ec 100644 (file)
--- a/icu4c/source/configure.in
+++ b/icu4c/source/configure.in
@@ -66,7 +66,8 @@ fi
 # Compute a reasonable library version from the release version. This is
 # very bad, but that's wanted... We want to make sure that the LIB_VERSION
 # has at least a dot in it, so we'll add a .0 if needed.
-[LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`]
+#[LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`]
+LIB_VERSION=$VERSION
 LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`
 AC_SUBST(VERSION)
 AC_SUBST(LIB_VERSION)

diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak
index 0c84d045e9fe8a9a3f2cbbda0cb6098b79e316a0..b5b2976f3b4de91aaf2b57345ae6a846d2f16e07 100644 (file)
--- a/icu4c/source/data/makedata.mak
+++ b/icu4c/source/data/makedata.mak
@@ -10,7 +10,7 @@
 
 ##############################################################################
 # Keep the following in sync with the version - see common/unicode/uvernum.h
-U_ICUDATA_NAME=icudt48
+U_ICUDATA_NAME=icudt49
 ##############################################################################
 U_ICUDATA_ENDIAN_SUFFIX=l
 UNICODE_VERSION=6.0

diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt
index e9f7c09a112e78aa9f2e053963f460fd17e022d0..f617e48cc29ebda82cc1701c5625ea5b4b1cd282 100644 (file)
--- a/icu4c/source/data/misc/icuver.txt
+++ b/icu4c/source/data/misc/icuver.txt
@@ -6,6 +6,6 @@
 // ***************************************************************************
 
 icuver:table(nofallback){ 
-    DataVersion { "4.8.0.0" }
-    ICUVersion  { "4.8.0.0" }
+    DataVersion { "49.0.1.0" }
+    ICUVersion  { "49.0.1.0" }
 }

diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj
index c83f024062718e4752c30e9429c610c7564e3808..22ab4e9b9d5ec644362436249574b1afc13e0f99 100644 (file)
--- a/icu4c/source/i18n/i18n.vcxproj
+++ b/icu4c/source/i18n/i18n.vcxproj
@@ -107,7 +107,7 @@
       <AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icuin48.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icuin49.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib\icuin.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -151,7 +151,7 @@
       <AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icuin48d.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icuin49d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib\icuind.pdb</ProgramDatabaseFile>\r
@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icuin48.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icuin49.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib64\icuin.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -234,7 +234,7 @@
       <AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icuin48d.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icuin49d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib64\icuind.pdb</ProgramDatabaseFile>\r

diff --git a/icu4c/source/layout/layout.vcxproj b/icu4c/source/layout/layout.vcxproj
index 4fc2adc343e33371f0fd7af2ffe3fa5e64dc21c9..10d2a610a040f49315aa9bd0c2ef0d8a99afd646 100644 (file)
--- a/icu4c/source/layout/layout.vcxproj
+++ b/icu4c/source/layout/layout.vcxproj
@@ -110,7 +110,7 @@
       <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icule48d.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icule49d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib\iculed.pdb</ProgramDatabaseFile>\r
@@ -151,7 +151,7 @@
       <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icule48.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icule49.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib\icule.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -195,7 +195,7 @@
       <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icule48d.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icule49d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib64\iculed.pdb</ProgramDatabaseFile>\r
@@ -234,7 +234,7 @@
       <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icule48.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icule49.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib64\icule.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r

diff --git a/icu4c/source/layoutex/layoutex.vcxproj b/icu4c/source/layoutex/layoutex.vcxproj
index f27010abe33af7d9cd602ea9a9ee2151bbacd8b5..b114e6a0be2d3013b6682840ba5a00598437e479 100644 (file)
--- a/icu4c/source/layoutex/layoutex.vcxproj
+++ b/icu4c/source/layoutex/layoutex.vcxproj
@@ -107,7 +107,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\iculx48.dll</OutputFile>\r
+      <OutputFile>..\..\bin\iculx49.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib\iculx.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -150,7 +150,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\iculx48d.dll</OutputFile>\r
+      <OutputFile>..\..\bin\iculx49d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib\iculxd.pdb</ProgramDatabaseFile>\r
@@ -190,7 +190,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\iculx48.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\iculx49.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib64\iculx.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -231,7 +231,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\iculx48d.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\iculx49d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib64\iculxd.pdb</ProgramDatabaseFile>\r

diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj
index 961447f57a3d650e1f60c2c386edc9394a74935b..4916d0bc33a0bd782b63d923f672ea0ae395fb24 100644 (file)
--- a/icu4c/source/stubdata/stubdata.vcxproj
+++ b/icu4c/source/stubdata/stubdata.vcxproj
@@ -113,7 +113,7 @@
       <Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <OutputFile>..\..\bin\icudt48.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icudt49.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>\r
       <ProgramDatabaseFile>.\x86\Release\icudt.pdb</ProgramDatabaseFile>\r
@@ -160,7 +160,7 @@
       <Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <OutputFile>..\..\bin\icudt48.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icudt49.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\x86\Debug/icudt.pdb</ProgramDatabaseFile>\r
       <NoEntryPoint>true</NoEntryPoint>\r
@@ -207,7 +207,7 @@
       <Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icudt48.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icudt49.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>\r
       <ProgramDatabaseFile>.\x64\Release\icudt.pdb</ProgramDatabaseFile>\r
@@ -252,7 +252,7 @@
       <Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icudt48.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icudt49.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\x64\Debug/icudt.pdb</ProgramDatabaseFile>\r
       <NoEntryPoint>true</NoEntryPoint>\r

diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c
index 22ff5a0202a7a4112d17eaf4557af3b0e3426a4f..c6ab1f8cdb02128c7fd3c91ea710d1f98118d9df 100644 (file)
--- a/icu4c/source/test/cintltst/cldrtest.c
+++ b/icu4c/source/test/cintltst/cldrtest.c
@@ -867,7 +867,7 @@ findSetMatch( UScriptCode *scriptCodes, int32_t scriptsLen,
 }
 
 static void VerifyTranslation(void) {
-    static const UVersionInfo icu49 = { 4, 9, 0, 0 };
+    static const UVersionInfo icu49 = { 49, 1, 0, 0 };
     UResourceBundle *root, *currentLocale;
     int32_t locCount = uloc_countAvailable();
     int32_t locIndex;

diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c
index 0851bcbd5d26722990e31223ea64014021733d50..6cda58a3edac9ff3ce2b78f9d16e6a0e9842df9b 100644 (file)
--- a/icu4c/source/test/cintltst/creststn.c
+++ b/icu4c/source/test/cintltst/creststn.c
@@ -250,7 +250,7 @@ static void checkStatus(int32_t line, UErrorCode expected, UErrorCode status) {
 }
 
 static void TestErrorCodes(void) {
-  static const UVersionInfo icu49 = { 4, 9, 0, 0 };
+  static const UVersionInfo icu49 = { 49, 1, 0, 0 };
   UErrorCode status = U_USING_DEFAULT_WARNING;
 
   UResourceBundle *r = NULL, *r2 = NULL;

diff --git a/icu4c/source/test/cintltst/udatatst.c b/icu4c/source/test/cintltst/udatatst.c
index a7e2a14d294ada8b5f94e18d4d92550148612d44..a936bc245fa698ccf39de17d42d08c3769adcf35 100644 (file)
--- a/icu4c/source/test/cintltst/udatatst.c
+++ b/icu4c/source/test/cintltst/udatatst.c
@@ -1109,10 +1109,10 @@ static void TestICUDataName()
         break;
     }
 
-    sprintf(expectDataName, "%s%d%d%c",
+    /* Only major number is needed. */
+    sprintf(expectDataName, "%s%d%c",
                 "icudt",
                 (int)icuVersion[0],
-                (int)icuVersion[1],
                 typeChar);
 
     log_verbose("Expected: %s\n", expectDataName);

diff --git a/icu4c/source/test/intltest/rbbitst.cpp b/icu4c/source/test/intltest/rbbitst.cpp
index 880455c9fcd75d22f20bcb863df6fd8fc282c77c..aed26287c1369f95abca1241fc683b9c566cb256 100644 (file)
--- a/icu4c/source/test/intltest/rbbitst.cpp
+++ b/icu4c/source/test/intltest/rbbitst.cpp
@@ -2201,10 +2201,10 @@ void RBBITest::TestUnicodeFiles() {
 //-------------------------------------------------------------------------------------------
 void RBBITest::runUnicodeTestData(const char *fileName, RuleBasedBreakIterator *bi) {
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS
-// TODO(andy): Match line break behavior to Unicode 6.0 and remove this time bomb.
-  UVersionInfo icu49 = { 4, 9, 0, 0 };
-UBool isICUVersionPast48 = isICUVersionAtLeast(icu49);
-UBool isLineBreak = 0 == strcmp(fileName, "LineBreakTest.txt");
+    // TODO(andy): Match line break behavior to Unicode 6.0 and remove this time bomb.
+    UVersionInfo icu49 = { 49, 1, 0, 0 };
+    UBool isICUVersionPast48 = isICUVersionAtLeast(icu49);
+    UBool isLineBreak = 0 == strcmp(fileName, "LineBreakTest.txt");
     UErrorCode  status = U_ZERO_ERROR;
 
     //

diff --git a/icu4c/source/test/intltest/ssearch.cpp b/icu4c/source/test/intltest/ssearch.cpp
index 9cf89edbcd2d1f07d513683716c6ccc98316d8bb..0949b9b285f0b8df671b732ad821445df9eec406 100644 (file)
--- a/icu4c/source/test/intltest/ssearch.cpp
+++ b/icu4c/source/test/intltest/ssearch.cpp
@@ -904,7 +904,7 @@ static char *printOrders(char *buffer, OrderList &list)
 
 void SSearchTest::offsetTest()
 {
-    static const UVersionInfo icu49 = { 4, 9, 0, 0 };
+    static const UVersionInfo icu49 = { 49, 1, 0, 0 };
     const char *test[] = {
         // The sequence \u0FB3\u0F71\u0F71\u0F80 contains a discontiguous
         // contraction (\u0FB3\u0F71\u0F80) logically followed by \u0F71.
@@ -2342,7 +2342,7 @@ void SSearchTest::monkeyTest(char *params)
 
 void SSearchTest::bmMonkeyTest(char *params)
 {
-    static const UVersionInfo icu49 = { 4, 9, 0, 0 }; // for timebomb
+    static const UVersionInfo icu49 = { 49, 1, 0, 0 }; // for timebomb
     static const UChar skipChars[] = { 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0xAAB5, 0xAAB6, 0xAAB9, 0xAABB, 0xAABC, 0 }; // for timebomb
     // ook!
     UErrorCode status = U_ZERO_ERROR;