From: Steven R. Loomis Date: Fri, 30 Aug 2013 23:39:28 +0000 (+0000) Subject: ICU-9710 fixed U_PLATFORM on darwin. also added U_PF_BSD to the debug printf while... X-Git-Tag: milestone-59-0-1~2640 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3337da7e641c340bb20042eb77cb37bb88a6f7e6;p=icu ICU-9710 fixed U_PLATFORM on darwin. also added U_PF_BSD to the debug printf while at it. X-SVN-Rev: 34158 --- diff --git a/icu4c/source/common/unicode/platform.h b/icu4c/source/common/unicode/platform.h index 26f12f42c66..0db701491e1 100644 --- a/icu4c/source/common/unicode/platform.h +++ b/icu4c/source/common/unicode/platform.h @@ -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 #elif defined(linux) || defined(__linux__) || defined(__linux) # define U_PLATFORM U_PF_LINUX +#elif defined(__APPLE__) && defined(__MACH__) +# include +# 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 -# 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__) diff --git a/icu4c/source/tools/toolutil/udbgutil.cpp b/icu4c/source/tools/toolutil/udbgutil.cpp index c6a6074adfc..46c14c05779 100644 --- a/icu4c/source/tools/toolutil/udbgutil.cpp +++ b/icu4c/source/tools/toolutil/udbgutil.cpp @@ -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