Index: /trunk/JavaScriptCore/wtf/Platform.h
===================================================================
--- /trunk/JavaScriptCore/wtf/Platform.h	(revision 71311)
+++ /trunk/JavaScriptCore/wtf/Platform.h	(revision 71535)
@@ -815,5 +815,5 @@
 
 #if PLATFORM(QT)
-// We must not customize the global operator new and delete for the Qt port.
+/* We must not customize the global operator new and delete for the Qt port. */
 #define ENABLE_GLOBAL_FASTMALLOC_NEW 0
 #endif
Index: /trunk/JavaScriptCore/ChangeLog
===================================================================
--- /trunk/JavaScriptCore/ChangeLog	(revision 71532)
+++ /trunk/JavaScriptCore/ChangeLog	(revision 71535)
@@ -1,2 +1,14 @@
+2010-11-08  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        >=webkitgtk-1.2.5: parallel build fails with libtool: link: cannot find the library `libwebkit-1.0.la' or unhandled argument `libwebkit-1.0.la'
+        https://bugs.webkit.org/show_bug.cgi?id=49128
+
+        r59042 introduced a C++-style comment in Platform.h, which is often
+        included in C source files. Change it to a C-style comment.
+
+        * wtf/Platform.h: Fix the C++-style comment.
+
 2010-11-08  Adam Roben  <aroben@apple.com>