[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

andersca at apple.com andersca at apple.com
Mon Feb 21 00:14:24 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit ec5b439415876551f2683588c7adce94b472ff1b
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 28 23:12:47 2011 +0000

    Don't put config.h in the message headers.
    
    Reviewed by Sam Weinig.
    
    * Scripts/webkit2/messages.py:
    * Scripts/webkit2/messages_unittest.py:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77000 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 8bc9eae..de90149 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,14 @@
 2011-01-28  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Sam Weinig.
+
+        Don't put config.h in the message headers.
+
+        * Scripts/webkit2/messages.py:
+        * Scripts/webkit2/messages_unittest.py:
+
+2011-01-28  Anders Carlsson  <andersca at apple.com>
+
         Fix build.
 
         * Shared/mac/ShareableSurface.cpp:
diff --git a/Source/WebKit2/Scripts/webkit2/messages.py b/Source/WebKit2/Scripts/webkit2/messages.py
index dacae34..ffb53f1 100644
--- a/Source/WebKit2/Scripts/webkit2/messages.py
+++ b/Source/WebKit2/Scripts/webkit2/messages.py
@@ -49,7 +49,6 @@ _license_header = """/*
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 """
 
 class MessageReceiver(object):
@@ -324,7 +323,6 @@ def generate_messages_header(file):
     result = []
 
     result.append(_license_header)
-    result.append('\n')
 
     result.append('#ifndef %s\n' % header_guard)
     result.append('#define %s\n\n' % header_guard)
@@ -475,6 +473,7 @@ def generate_message_handler(file):
     result = []
 
     result.append(_license_header)
+    result.append('#include "config.h"\n')
     result.append('\n')
 
     if receiver.condition:
diff --git a/Source/WebKit2/Scripts/webkit2/messages_unittest.py b/Source/WebKit2/Scripts/webkit2/messages_unittest.py
index 9052ee6..8ed8cee 100644
--- a/Source/WebKit2/Scripts/webkit2/messages_unittest.py
+++ b/Source/WebKit2/Scripts/webkit2/messages_unittest.py
@@ -247,8 +247,6 @@ _expected_header = """/*
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
-
 #ifndef WebPageMessages_h
 #define WebPageMessages_h
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list