Title: [108660] trunk/Source/_javascript_Core
- Revision
- 108660
- Author
- [email protected]
- Date
- 2012-02-23 12:47:24 -0800 (Thu, 23 Feb 2012)
Log Message
[wx] Build fix for non-Mac wx builds.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (108659 => 108660)
--- trunk/Source/_javascript_Core/ChangeLog 2012-02-23 20:46:31 UTC (rev 108659)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-02-23 20:47:24 UTC (rev 108660)
@@ -1,3 +1,9 @@
+2012-02-23 Kevin Ollivier <[email protected]>
+
+ [wx] Build fix for non-Mac wx builds.
+
+ * runtime/DatePrototype.cpp:
+
2012-02-22 Filip Pizlo <[email protected]>
DFG's logic for emitting a Flush is too convoluted and contains an inaccurate comment
Modified: trunk/Source/_javascript_Core/runtime/DatePrototype.cpp (108659 => 108660)
--- trunk/Source/_javascript_Core/runtime/DatePrototype.cpp 2012-02-23 20:46:31 UTC (rev 108659)
+++ trunk/Source/_javascript_Core/runtime/DatePrototype.cpp 2012-02-23 20:47:24 UTC (rev 108660)
@@ -60,7 +60,7 @@
#include <sys/timeb.h>
#endif
-#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(WX) || (PLATFORM(QT) && OS(DARWIN))
+#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WX) && OS(DARWIN)) || (PLATFORM(QT) && OS(DARWIN))
#include <CoreFoundation/CoreFoundation.h>
#elif USE(ICU_UNICODE)
#include <unicode/udat.h>
@@ -130,7 +130,7 @@
enum LocaleDateTimeFormat { LocaleDateAndTime, LocaleDate, LocaleTime };
-#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(WX) || (PLATFORM(QT) && OS(DARWIN))
+#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WX) && OS(DARWIN)) || (PLATFORM(QT) && OS(DARWIN))
// FIXME: Since this is superior to the strftime-based version, why limit this to PLATFORM(MAC)?
// Instead we should consider using this whenever USE(CF) is true.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
