c89dab21ea
FreeBSD and other BSDs (except for NetBSD) must not define U_TIMEZONE. This patch is obtained from upstream: http://bugs.icu-project.org/trac/changeset?reponame=&new=31780 Change-Id: Id1b85b9958036230045c3e13eb4b6617e6bdc924
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
--- misc/icu/source/common/putilimp.h 2012-06-01 10:52:52.000000000 -0400
|
|
+++ misc/build/icu/source/common/putilimp.h 2012-08-21 13:32:58.000000000 -0400
|
|
@@ -117,6 +117,8 @@
|
|
# 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
|
|
--- misc/icu/source/common/unicode/platform.h 2012-08-21 16:53:20.957449000 -0400
|
|
+++ misc/build/icu/source/common/unicode/platform.h 2012-08-21 17:02:16.000000000 -0400
|
|
@@ -131,7 +131,7 @@
|
|
# include <android/api-level.h>
|
|
#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? */
|