[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrowe at apple.com
mrowe at apple.com
Wed Dec 22 12:40:38 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c74d311c9bd1f3a4c5ca229666e090a65c415914
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 27 00:34:00 2010 +0000
Fix two build issues that are revealed when building with clang.
Reviewed by Adam Roben.
* platform/mac/PopupMenuMac.h: Forward-declare as an Objective-C class when compiling for Objective-C.
* platform/network/BlobResourceHandle.h: Forward-declare as a struct to match the real declaration.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66158 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c34e022..66aa2cc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
2010-08-26 Mark Rowe <mrowe at apple.com>
+ Reviewed by Adam Roben.
+
+ Fix two build issues that are revealed when building with clang.
+
+ * platform/mac/PopupMenuMac.h: Forward-declare as an Objective-C class when compiling for Objective-C.
+ * platform/network/BlobResourceHandle.h: Forward-declare as a struct to match the real declaration.
+
+2010-08-26 Mark Rowe <mrowe at apple.com>
+
Reviewed by Sam Weinig.
<rdar://problem/8339008> WebCore's MediaPlayerPrivateQTKit.mm fails to build with clang.
diff --git a/WebCore/platform/mac/PopupMenuMac.h b/WebCore/platform/mac/PopupMenuMac.h
index e969fff..8e21913 100644
--- a/WebCore/platform/mac/PopupMenuMac.h
+++ b/WebCore/platform/mac/PopupMenuMac.h
@@ -26,7 +26,11 @@
#include <wtf/RefCounted.h>
#include <wtf/RetainPtr.h>
+#ifdef __OBJC__
+ at class NSPopUpButtonCell;
+#else
class NSPopUpButtonCell;
+#endif
namespace WebCore {
diff --git a/WebCore/platform/network/BlobResourceHandle.h b/WebCore/platform/network/BlobResourceHandle.h
index b2a0854..63e8578 100644
--- a/WebCore/platform/network/BlobResourceHandle.h
+++ b/WebCore/platform/network/BlobResourceHandle.h
@@ -42,11 +42,11 @@
namespace WebCore {
class AsyncFileStream;
-class BlobDataItem;
class BlobStorageData;
class FileStream;
class ResourceHandleClient;
class ResourceRequest;
+struct BlobDataItem;
class BlobResourceHandle : public FileStreamClient, public ResourceHandle {
public:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list