Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Unified Diff: public/common/unicode/pmac.h

Issue 10692124: Fix ICU time zone support on iOS (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/icu46
Patch Set: Added another bug ref Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « patches/ios_timezone.patch ('k') | source/common/putil.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: public/common/unicode/pmac.h
diff --git a/public/common/unicode/pmac.h b/public/common/unicode/pmac.h
index 80cf0f6d870c451bb81b4c079e844aaa411c8298..3686ea9a612b809411e6e5ed0f3dc0aebe4c9e83 100644
--- a/public/common/unicode/pmac.h
+++ b/public/common/unicode/pmac.h
@@ -50,6 +50,16 @@
#endif
#include <AvailabilityMacros.h>
+#include <TargetConditionals.h>
+
+/**
+ * Add a second platform define to handle differences between Mac OS X and iOS
+ */
+#if TARGET_OS_IPHONE
+#ifndef U_IOS
+#define U_IOS
+#endif
+#endif
/**
* \def U_HAVE_DIRENT_H
@@ -288,11 +298,16 @@
#if 1
#define U_TZSET tzset
#endif
+#ifndef U_IOS
+/* The iOS version of timezone is busted (at least in the simulator, it is
+ never set to anything useful). Leave it undefined to avoid a code path
+ in putil.c. */
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
#define U_TIMEZONE 0
#else
#define U_TIMEZONE timezone
#endif
+#endif // !U_IOS
#if 1
#define U_TZNAME tzname
#endif
« no previous file with comments | « patches/ios_timezone.patch ('k') | source/common/putil.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698