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

mrobinson at webkit.org mrobinson at webkit.org
Wed Dec 22 14:40:55 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8bb142b23ae1b5ad8072489b91e74847e25f4c6c
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 15 19:57:09 2010 +0000

    2010-10-15  Martin Robinson  <mrobinson at igalia.com>
    
            Build fix for GTK+.
    
            * platform/network/soup/cache/webkit/soup-cache.h: Do not use PLATFORM(...) macro
            in a file that does not include config.h
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69873 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3257982..5fa574f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-15  Martin Robinson  <mrobinson at igalia.com>
+
+        Build fix for GTK+.
+
+        * platform/network/soup/cache/webkit/soup-cache.h: Do not use PLATFORM(...) macro
+        in a file that does not include config.h
+
 2010-10-15  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/platform/network/soup/cache/webkit/soup-cache.h b/WebCore/platform/network/soup/cache/webkit/soup-cache.h
index 2a5e5cb..e447cfc 100644
--- a/WebCore/platform/network/soup/cache/webkit/soup-cache.h
+++ b/WebCore/platform/network/soup/cache/webkit/soup-cache.h
@@ -23,7 +23,7 @@
 #ifndef WEBKIT_SOUP_CACHE_H
 #define WEBKIT_SOUP_CACHE_H 1
 
-#if PLATFORM(GTK)
+#if BUILDING_GTK__
 #include <webkit/webkitdefines.h>
 #else
 #ifndef WEBKIT_API

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list