[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:24:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit bbc49c42f8f8858872b7c1d27c61c91b5cfdb17d
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 7 22:51:04 2010 +0000
Build fix.
GCC continued to mask the fact that I still hadn't declared the correct symbol.
* Platform/Logging.cpp:
(initializeLogChannel):
* Platform/Logging.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69348 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b68e329..90f9975 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-07 Brady Eidson <beidson at apple.com>
+
+ Build fix.
+
+ GCC continued to mask the fact that I still hadn't declared the correct symbol.
+
+ * Platform/Logging.cpp:
+ (initializeLogChannel):
+ * Platform/Logging.h:
+
2010-10-07 Brian Weinstein <bweinstein at apple.com>
Build Fix. Fix the vcproj to make it valid and openable by Visual Studio.
diff --git a/WebKit2/Platform/Logging.cpp b/WebKit2/Platform/Logging.cpp
index 394a1ba..3afcfb8 100644
--- a/WebKit2/Platform/Logging.cpp
+++ b/WebKit2/Platform/Logging.cpp
@@ -29,7 +29,7 @@
WTFLogChannel LogSessionState = { 0x00000001, "WebKit2LogLevel", WTFLogChannelOn };
-static inline void initializeLogChannel(WTFLogChannel& channel)
+static inline void initializeLogChannel(WTFLogChannel* channel)
{
// FIXME: This is a build fix. Each platform will need to define their own initializeLogChannel().
}
diff --git a/WebKit2/Platform/Logging.h b/WebKit2/Platform/Logging.h
index 13f38e2..f655552 100644
--- a/WebKit2/Platform/Logging.h
+++ b/WebKit2/Platform/Logging.h
@@ -39,7 +39,6 @@ EXTERN_C_BEGIN
extern WTFLogChannel LogSessionState;
void initializeLogChannelsIfNecessary(void);
-void initializeLogChannel(WTFLogChannel*);
EXTERN_C_END
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list