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

X-SVN-Rev: 31897
This commit is contained in:
Michael Ow 2012-06-01 14:47:31 +00:00
parent 9c02795ab2
commit f0b25ada51
2 changed files with 2 additions and 2 deletions

View file

@ -17,7 +17,7 @@ U_NAMESPACE_BEGIN
enum EDecimalFormatFastpathStatus {
kFastpathNO = 0,
kFastpathYES = 1,
kFastpathUNKNOWN = 2, /* not yet set */
kFastpathUNKNOWN = 2 /* not yet set */
};
/**

View file

@ -1571,7 +1571,7 @@ static int32_t pkg_createWithoutAssemblyCode(UPKGOptions *o, const char *targetD
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);