[haiku-webkit-commits] r545 - webkit/trunk/WebCore/platform/haiku
- From: webkit@xxxxxxxxxxxxxxx
- To: haiku-webkit-commits@xxxxxxxxxxxxx
- Date: Tue, 31 Aug 2010 01:24:21 +0000
Author: anevilyak
Date: Tue Aug 31 01:24:21 2010
New Revision: 545
URL: http://mmlr.dyndns.org/changeset/545
Log:
Build fix due to recent Locale Kit changes.
Modified:
webkit/trunk/WebCore/platform/haiku/Language.cpp
Modified: webkit/trunk/WebCore/platform/haiku/Language.cpp
==============================================================================
--- webkit/trunk/WebCore/platform/haiku/Language.cpp Thu Aug 19 00:51:51
2010 (r544)
+++ webkit/trunk/WebCore/platform/haiku/Language.cpp Tue Aug 31 01:24:21
2010 (r545)
@@ -28,6 +28,9 @@
#include "PlatformString.h"
+// JavaScriptCore's Locker.h winds up taking precedence over ours
+// hence the explicit path
+#include <os/support/Locker.h>
#include <Locale.h>
#include <LocaleRoster.h>
#include <stdio.h>
@@ -41,7 +44,7 @@
if (!initialized) {
initialized = true;
BLanguage language;
- if (be_locale_roster->GetDefaultLanguage(&language) == B_OK)
+ if (be_locale->GetLanguage(&language) == B_OK)
local = language.ID();
else
local = "en_US";
Other related posts:
- » [haiku-webkit-commits] r545 - webkit/trunk/WebCore/platform/haiku - webkit
