organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-9710 fixed U_PLATFORM on darwin. also added U_PF_BSD to the debug printf while at it.

Browse source 
X-SVN-Rev: 34158
This commit is contained in:
Steven R. Loomis 2013-08-30 23:39:28 +00:00
parent 97f490833e
commit 3337da7e64
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
icu4c/source/common/unicode/platform.h
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1997-2012, International Business Machines
* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -144,6 +144,13 @@
# include <android/api-level.h>
#elif defined(linux) || defined(__linux__) || defined(__linux)
# define U_PLATFORM U_PF_LINUX
#elif defined(__APPLE__) && defined(__MACH__)
# include <TargetConditionals.h>
# if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE /* variant of TARGET_OS_MAC */
# define U_PLATFORM U_PF_IPHONE
# else
# define U_PLATFORM U_PF_DARWIN
# endif
#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)
# define U_PLATFORM U_PF_BSD
#elif defined(sun) || defined(__sun)
@ -162,13 +169,6 @@
# define U_PLATFORM U_PF_HPUX
#elif defined(sgi) || defined(__sgi)
# define U_PLATFORM U_PF_IRIX
#elif defined(__APPLE__) && defined(__MACH__)
# include <TargetConditionals.h>
# if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE /* variant of TARGET_OS_MAC */
# define U_PLATFORM U_PF_IPHONE
# else
# define U_PLATFORM U_PF_DARWIN
# endif
#elif defined(macintosh)
# define U_PLATFORM U_PF_CLASSIC_MACOS
#elif defined(__QNX__) || defined(__QNXNTO__)

4
icu4c/source/tools/toolutil/udbgutil.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2007-2012, International Business Machines Corporation and
* Copyright (c) 2007-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -345,6 +345,8 @@ U_CAPI const char *udbg_getPlatform(void)
return "unknown";
#elif U_PLATFORM == U_PF_DARWIN
return "Darwin";
#elif U_PLATFORM == U_PF_BSD
return "BSD";
#elif U_PLATFORM == U_PF_QNX
return "QNX";
#elif U_PLATFORM == U_PF_LINUX