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

andersca at apple.com andersca at apple.com
Wed Dec 22 13:09:50 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 45a472a44883ec946f1d5d70629852b9795abc9d
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 00:32:54 2010 +0000

    Fix clang++ build.
    
    Reviewed by Oliver Hunt.
    
    * Misc/WebLocalizableStrings.h:
    Fix a struct/tag mismatch.
    
    * WebView/WebDeviceOrientationProviderMock.mm:
    (-[WebDeviceOrientationProviderMock init]):
    Remove stray semicolon.
    
    * WebView/WebViewData.h:
    Remove unused class forward declaration.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66935 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 9a431c1..0ba7d60 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,21 @@
 2010-09-07  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Oliver Hunt.
+
+        Fix clang++ build.
+
+        * Misc/WebLocalizableStrings.h:
+        Fix a struct/tag mismatch.
+
+        * WebView/WebDeviceOrientationProviderMock.mm:
+        (-[WebDeviceOrientationProviderMock init]):
+        Remove stray semicolon.
+
+        * WebView/WebViewData.h:
+        Remove unused class forward declaration.
+
+2010-09-07  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Darin Adler.
 
         <rdar://problem/8381749> -Wcast-align warning emitted when building with clang
diff --git a/WebKit/mac/Misc/WebLocalizableStrings.h b/WebKit/mac/Misc/WebLocalizableStrings.h
index ecad83d..853b601 100644
--- a/WebKit/mac/Misc/WebLocalizableStrings.h
+++ b/WebKit/mac/Misc/WebLocalizableStrings.h
@@ -28,6 +28,8 @@
 
 #if __OBJC__
 @class NSBundle;
+#elif __cplusplus
+class NSBundle;
 #else
 typedef struct NSBundle NSBundle;
 #endif
diff --git a/WebKit/mac/WebView/WebDeviceOrientationProviderMock.mm b/WebKit/mac/WebView/WebDeviceOrientationProviderMock.mm
index 13bd455..0435264 100644
--- a/WebKit/mac/WebView/WebDeviceOrientationProviderMock.mm
+++ b/WebKit/mac/WebView/WebDeviceOrientationProviderMock.mm
@@ -78,7 +78,7 @@ using namespace WebCore;
 
 @implementation WebDeviceOrientationProviderMock
 
-- (id)init;
+- (id)init
 {
     self = [super init];
     if (!self)
diff --git a/WebKit/mac/WebView/WebViewData.h b/WebKit/mac/WebView/WebViewData.h
index a9d2b9e..558770e 100644
--- a/WebKit/mac/WebView/WebViewData.h
+++ b/WebKit/mac/WebView/WebViewData.h
@@ -38,7 +38,6 @@ namespace WebCore {
     class Page;
 }
 
- at class WebDeviceOrientationClient;
 @class WebInspector;
 @class WebNodeHighlight;
 @class WebPluginDatabase;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list