Title: [94939] trunk/Source/_javascript_Core
- Revision
- 94939
- Author
- [email protected]
- Date
- 2011-09-11 20:31:18 -0700 (Sun, 11 Sep 2011)
Log Message
Unreviewed build fix for chromium/mac & clang.
Fix the macro redefinition error by r94927, because chromium set
ENABLE_JSC_MULTIPLE_THREADS=0 in WebKit/chromium/features.gypi and
it is not PLATFORM(QT).
../../_javascript_Core/wtf/Platform.h:512:9: error: 'ENABLE_JSC_MULTIPLE_THREADS' macro redefined [-Werror]
#define ENABLE_JSC_MULTIPLE_THREADS 1
<command line>:43:9: note: previous definition is here
#define ENABLE_JSC_MULTIPLE_THREADS 0
1 error generated.
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (94938 => 94939)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-12 03:25:04 UTC (rev 94938)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-12 03:31:18 UTC (rev 94939)
@@ -1,3 +1,18 @@
+2011-09-11 Fumitoshi Ukai <[email protected]>
+
+ Unreviewed build fix for chromium/mac & clang.
+
+ Fix the macro redefinition error by r94927, because chromium set
+ ENABLE_JSC_MULTIPLE_THREADS=0 in WebKit/chromium/features.gypi and
+ it is not PLATFORM(QT).
+ ../../_javascript_Core/wtf/Platform.h:512:9: error: 'ENABLE_JSC_MULTIPLE_THREADS' macro redefined [-Werror]
+ #define ENABLE_JSC_MULTIPLE_THREADS 1
+ <command line>:43:9: note: previous definition is here
+ #define ENABLE_JSC_MULTIPLE_THREADS 0
+ 1 error generated.
+
+ * wtf/Platform.h:
+
2011-09-11 Sam Weinig <[email protected]>
Remove JSCell::isPropertyNameIterator(), it is unused
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (94938 => 94939)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2011-09-12 03:25:04 UTC (rev 94938)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2011-09-12 03:31:18 UTC (rev 94939)
@@ -511,15 +511,19 @@
/* FIXME: JSC multithreading currently only supports pthread.
Qt-Win cannot do multithreading because it is not pthread-based. */
-#if !defined(ENABLE_JSC_MULTIPLE_THREADS) && (!PLATFORM(QT) || USE(PTHREAD_BASED_QT))
+#if !defined(ENABLE_JSC_MULTIPLE_THREADS)
+#if !PLATFORM(QT) || USE(PTHREAD_BASED_QT)
#define ENABLE_JSC_MULTIPLE_THREADS 1
#endif
+#endif
/* FIXME: JSC multithreading currently only supports pthread.
Qt-Win cannot do multithreading because it is not pthread-based. */
-#if !defined(ENABLE_WTF_MULTIPLE_THREADS) && (!PLATFORM(QT) || USE(PTHREAD_BASED_QT))
+#if !defined(ENABLE_WTF_MULTIPLE_THREADS)
+#if !PLATFORM(QT) || USE(PTHREAD_BASED_QT)
#define ENABLE_WTF_MULTIPLE_THREADS 1
#endif
+#endif
/* On Windows, use QueryPerformanceCounter by default */
#if OS(WINDOWS)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
