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

  • From: webkit@xxxxxxxxxxxxxxx
  • To: haiku-webkit-commits@xxxxxxxxxxxxx
  • Date: Mon, 02 Aug 2010 03:56:48 +0000

Author: anevilyak
Date: Mon Aug  2 03:56:48 2010
New Revision: 542
URL: http://mmlr.dyndns.org/changeset/542

Log:
Build fix/update to bring Web+ inline with r37831.

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

Modified: webkit/trunk/WebCore/platform/haiku/Language.cpp
==============================================================================
--- webkit/trunk/WebCore/platform/haiku/Language.cpp    Sat Jul 31 19:12:48 
2010        (r541)
+++ webkit/trunk/WebCore/platform/haiku/Language.cpp    Mon Aug  2 03:56:48 
2010        (r542)
@@ -28,11 +28,6 @@
 
 #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>
@@ -45,9 +40,9 @@
     static bool initialized = false;
     if (!initialized) {
        initialized = true;
-       BLanguage* language;
+       BLanguage language;
         if (be_locale_roster->GetDefaultLanguage(&language) == B_OK)
-            local = language->ID();
+            local = language.ID();
         else
             local = "en_US";
            local.ReplaceAll('_', '-');

Other related posts:

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