[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
laszlo.1.gombos at nokia.com
laszlo.1.gombos at nokia.com
Mon Feb 21 00:07:12 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit df941dcc2f171804888b417a59da045b3819244a
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 28 06:42:23 2011 +0000
2011-01-27 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Adam Barth.
Update the expected results for test-webkitpy after r76916.
Include "config.h" in the expected results as well.
* Scripts/webkit2/messages_unittest.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76919 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 725b918..63f6ea9 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,15 @@
2011-01-27 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+ Reviewed by Adam Barth.
+
+ Update the expected results for test-webkitpy after r76916.
+
+ Include "config.h" in the expected results as well.
+
+ * Scripts/webkit2/messages_unittest.py:
+
+2011-01-27 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
Unreviewed buildfix for SnowLeopard Intel Debug.
Fix macro redefinition by not including config.h.
diff --git a/Source/WebKit2/Scripts/webkit2/messages_unittest.py b/Source/WebKit2/Scripts/webkit2/messages_unittest.py
index 25123c0..9052ee6 100644
--- a/Source/WebKit2/Scripts/webkit2/messages_unittest.py
+++ b/Source/WebKit2/Scripts/webkit2/messages_unittest.py
@@ -47,6 +47,8 @@ _messages_file_contents = """# Copyright (C) 2010 Apple Inc. All rights reserved
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#include "config.h"
+
#if ENABLE(WEBKIT2)
messages -> WebPage {
@@ -245,6 +247,8 @@ _expected_header = """/*
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "config.h"
+
#ifndef WebPageMessages_h
#define WebPageMessages_h
@@ -478,6 +482,8 @@ _expected_receiver_implementation = """/*
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "config.h"
+
#if ENABLE(WEBKIT2)
#include "WebPage.h"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list