[haiku-webkit-commits] r538 - webkit/trunk/WebCore/platform/haiku

  • From: webkit@xxxxxxxxxxxxxxx
  • To: haiku-webkit-commits@xxxxxxxxxxxxx
  • Date: Sat, 24 Jul 2010 02:54:39 +0000

Author: anevilyak
Date: Sat Jul 24 02:54:39 2010
New Revision: 538
URL: http://mmlr.dyndns.org/changeset/538

Log:
Fix build error due to header clash.

Modified:
   webkit/trunk/WebCore/platform/haiku/Language.cpp

Modified: webkit/trunk/WebCore/platform/haiku/Language.cpp
==============================================================================
--- webkit/trunk/WebCore/platform/haiku/Language.cpp    Tue Jul 20 19:02:13 
2010        (r537)
+++ webkit/trunk/WebCore/platform/haiku/Language.cpp    Sat Jul 24 02:54:39 
2010        (r538)
@@ -27,6 +27,12 @@
 #include "Language.h"
 
 #include "PlatformString.h"
+
+// JavascriptCore also has a Locker.h which is taking precedence over ours
+// hence the explicit path declaration
+// otherwise BLanguage fails to build since its BLocker include fails.
+
+#include <support/Locker.h>
 #include <Locale.h>
 #include <LocaleRoster.h>
 #include <stdio.h>

Other related posts:

  • » [haiku-webkit-commits] r538 - webkit/trunk/WebCore/platform/haiku - webkit