[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
zimmermann at webkit.org
zimmermann at webkit.org
Fri Feb 26 22:16:01 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 003bb356b06625dc4182db59f2c71159affc1f95
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 9 16:34:34 2010 +0000
2010-02-09 Nikolas Zimmermann <nzimmermann at rim.com>
Not reviewed. Try to fix build problem on SnowLeopard slaves to bring them back.
* API/JSClassRef.cpp:
(tryCreateStringFromUTF8): Mark method as 'static inline' to suppress "warning: no previous prototype for ..."
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54554 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/API/JSClassRef.cpp b/JavaScriptCore/API/JSClassRef.cpp
index 37bbff8..747aa16 100644
--- a/JavaScriptCore/API/JSClassRef.cpp
+++ b/JavaScriptCore/API/JSClassRef.cpp
@@ -41,7 +41,7 @@ using namespace WTF::Unicode;
const JSClassDefinition kJSClassDefinitionEmpty = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-UString tryCreateStringFromUTF8(const char* string)
+static inline UString tryCreateStringFromUTF8(const char* string)
{
if (!string)
return UString::null();
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 54c4e5f..dc3a7ed 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-09 Nikolas Zimmermann <nzimmermann at rim.com>
+
+ Not reviewed. Try to fix build problem on SnowLeopard slaves to bring them back.
+
+ * API/JSClassRef.cpp:
+ (tryCreateStringFromUTF8): Mark method as 'static inline' to suppress "warning: no previous prototype for ..."
+
2010-02-09 Gavin Barraclough <barraclough at apple.com>
Reviewed by Oliver Hunt.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list