commit f0b25ada5141d283892042316f87aeb5a9e3dfc3
author Michael Ow <mow@svn.icu-project.org> Fri Jun 01 14:47:31 2012 +0000
committer Michael Ow <mow@svn.icu-project.org> Fri Jun 01 14:47:31 2012 +0000
tree 7245e31657e4599af421a0b8a9336143e6884511
parent 9c02795ab29a867b129332c6e728a3bffe9acca0

ICU-9287 merge of r31895,r31896 of #9258 and #9336 for 49.x

X-SVN-Rev: 31897

source/i18n/dcfmtimp.h

diff --git a/source/i18n/dcfmtimp.h b/source/i18n/dcfmtimp.h
index 6bc2c0f..87bf798 100644
--- a/source/i18n/dcfmtimp.h
+++ b/source/i18n/dcfmtimp.h
@@ -17,7 +17,7 @@
 enum EDecimalFormatFastpathStatus {
   kFastpathNO = 0,
   kFastpathYES = 1,
-  kFastpathUNKNOWN = 2, /* not yet set */
+  kFastpathUNKNOWN = 2 /* not yet set */
 };
 
 /**

source/tools/pkgdata/pkgdata.cpp

diff --git a/source/tools/pkgdata/pkgdata.cpp b/source/tools/pkgdata/pkgdata.cpp
index 19f66a1..5df235d 100644
--- a/source/tools/pkgdata/pkgdata.cpp
+++ b/source/tools/pkgdata/pkgdata.cpp
@@ -1571,7 +1571,7 @@
     if (result == 0) {
         /* Generate the library file. */
 #if U_PLATFORM == U_PF_OS390
-        if (o->pdsbuild && IN_MODE_DLL(mode)) {
+        if (o->pdsbuild && IN_DLL_MODE(mode)) {
             result = pkg_generateLibraryFile("",mode, buffer, cmd);
         } else {
             result = pkg_generateLibraryFile(targetDir,mode, buffer, cmd);