From 989e7a4395bb685b7d4ef7c43d1b431c6596fb49 Mon Sep 17 00:00:00 2001 From: Will Mason Date: Thu, 26 Apr 2012 21:45:02 +0000 Subject: [PATCH] ICU-9286 Fix for variations in the presence of the timezone symbol on BSDs X-SVN-Rev: 31780 --- icu4c/source/common/putilimp.h | 2 ++ icu4c/source/common/unicode/platform.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/icu4c/source/common/putilimp.h b/icu4c/source/common/putilimp.h index cbec89bf59..3f097d3b86 100644 --- a/icu4c/source/common/putilimp.h +++ b/icu4c/source/common/putilimp.h @@ -116,6 +116,8 @@ typedef size_t uintptr_t; # define U_TIMEZONE __timezone #elif U_PLATFORM_USES_ONLY_WIN32_API # define U_TIMEZONE _timezone +#elif U_PLATFORM == U_PF_BSD && !defined(__NetBSD__) + /* not defined */ #elif U_PLATFORM == U_PF_OS400 /* not defined */ #else diff --git a/icu4c/source/common/unicode/platform.h b/icu4c/source/common/unicode/platform.h index dccc7018e0..915e05238f 100644 --- a/icu4c/source/common/unicode/platform.h +++ b/icu4c/source/common/unicode/platform.h @@ -131,7 +131,7 @@ # include #elif defined(linux) || defined(__linux__) || defined(__linux) # define U_PLATFORM U_PF_LINUX -#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) # define U_PLATFORM U_PF_BSD #elif defined(sun) || defined(__sun) /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */