organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-9287 merge of #9336 for 49.x

Browse source 
X-SVN-Rev: 31892
This commit is contained in:
Michael Ow 2012-05-31 16:50:59 +00:00
parent 9299168445
commit 9c02795ab2
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/common/putilimp.h
View file

@ -65,7 +65,8 @@
*
* Do not use ptrdiff_t since it is signed. size_t is unsigned.
*/
#if !defined(__intptr_t_defined) && !defined(UINTPTR_MAX)
/* TODO: This check fails on some z environments. Filed a ticket #9357 for this. */
#if !defined(__intptr_t_defined) && !defined(UINTPTR_MAX) && (U_PLATFORM != U_PF_OS390)
typedef size_t uintptr_t;
#endif

4
source/tools/ctestfw/unicode/utimer.h
View file

@ -1,6 +1,6 @@
/*
************************************************************************
* Copyright (c) 1997-2011, International Business Machines
* Copyright (c) 1997-2012, International Business Machines
* Corporation and others. All Rights Reserved.
************************************************************************
*/
@ -15,7 +15,7 @@
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#else
# if U_PLATFORM == U_PF_OS390
# if U_PLATFORM == U_PF_OS390 && !defined(__UU)
# define __UU /* Universal Unix - for struct timeval */
# endif
# include <time.h>

2
source/tools/pkgdata/pkgdata.cpp
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 && mode == MODE_DLL) {
if (o->pdsbuild && IN_MODE_DLL(mode)) {
result = pkg_generateLibraryFile("",mode, buffer, cmd);
} else {
result = pkg_generateLibraryFile(targetDir,mode, buffer, cmd);