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

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0fe84035f2a1f51864f074fc20a99e2d51cb90e9
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 27 17:53:51 2010 +0000

    2010-09-27  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] use ENABLE(GLIB_SUPPORT)
            https://bugs.webkit.org/show_bug.cgi?id=46630
    
            Enabling GLIB_SUPPORT on all ports that use GLib to simplify
            checks.
    
            * GNUmakefile.am: Enabled the GLIB_SUPPORT define.
    
    JavaScriptCore:
    
            Reviewed by Martin Robinson.
    
            [GTK] use ENABLE(GLIB_SUPPORT)
            https://bugs.webkit.org/show_bug.cgi?id=46630
    
            * wtf/Platform.h: Include GTypedefs.h only if glib support
            is explicitly enabled.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68405 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 471f196..2468e01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-27  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] use ENABLE(GLIB_SUPPORT)
+        https://bugs.webkit.org/show_bug.cgi?id=46630
+
+        Enabling GLIB_SUPPORT on all ports that use GLib to simplify
+        checks.
+
+        * GNUmakefile.am: Enabled the GLIB_SUPPORT define.
+
 2010-09-24  Romain Pokrzywka  <romain at kdab.com>
 
         Reviewed by Simon Hausmann.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index c769db2..2a866cd 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -91,7 +91,8 @@ global_cppflags += \
 	-Wformat -Wformat-security -Wno-format-y2k -Wundef \
 	-Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
 	-Wno-unused-parameter -Wno-parentheses \
-	-fno-exceptions
+	-fno-exceptions -DENABLE_GLIB_SUPPORT=1
+
 
 global_cxxflags += \
 	$(SYMBOL_VISIBILITY_INLINES) \
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ba424b8..7838b99 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-27  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] use ENABLE(GLIB_SUPPORT)
+        https://bugs.webkit.org/show_bug.cgi?id=46630
+
+        * wtf/Platform.h: Include GTypedefs.h only if glib support
+        is explicitly enabled.
+
 2010-09-25  Holger Hans Peter Freyther  <holger at moiji-mobile.com>
 
         Reviewed by Adam Barth.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index f50cab4..9f97fa9 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -1127,7 +1127,7 @@
 #define ENABLE_BRANCH_COMPACTION 1
 #endif
 
-#if PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(GLIB_SUPPORT))
+#if ENABLE(GLIB_SUPPORT)
 #include "GTypedefs.h"
 #endif
 

-- 
WebKit Debian packaging