[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

beidson at apple.com beidson at apple.com
Wed Dec 22 14:23:50 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 967dbba11997eec4556107fd7232bf3121475908
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 19:59:28 2010 +0000

    * Platform/Logging.cpp:
    (initializeLogChannel):  GCC optimized out the only caller of this function. Windows doesn't, and is breaking.
    
    Reviewed by BUILD FIX for non-gcc builds.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69333 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index fbe24fa..3cc07b5 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-07  Brady Eidson  <beidson at apple.com>
+
+        Reviewed by BUILD FIX for non-gcc builds.
+
+        * Platform/Logging.cpp:
+        (initializeLogChannel):  GCC optimized out the only caller of this function. Windows doesn't, and is breaking.
+
 2010-10-07  Darin Adler  <darin at apple.com>
 
         Fix include mistake that makes build fail with non-Objective-C.
diff --git a/WebKit2/Platform/Logging.cpp b/WebKit2/Platform/Logging.cpp
index 032776d..394a1ba 100644
--- a/WebKit2/Platform/Logging.cpp
+++ b/WebKit2/Platform/Logging.cpp
@@ -29,6 +29,11 @@
 
 WTFLogChannel LogSessionState = { 0x00000001, "WebKit2LogLevel", WTFLogChannelOn };
 
+static inline void initializeLogChannel(WTFLogChannel& channel)
+{
+    // FIXME: This is a build fix.  Each platform will need to define their own initializeLogChannel().
+}
+
 void initializeLogChannelsIfNecessary()
 {
     static bool haveInitializedLogChannels = false;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list