2010-09-27 Philippe Normand <pnormand@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: https://svn.webkit.org/repository/webkit/trunk@68405 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 471f196a8a5da0e92cb3ac91567383a7fdf37523..2468e01d1126ed130e55b679a4e2958d695dafaa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-27  Philippe Normand  <pnormand@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@kdab.com>
 
         Reviewed by Simon Hausmann.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index c769db2db85df0c6c5f4ef67df6b210d45e835de..2a866cd4727ce6cfcff3135fa22e1ce60bc19c78 100644 (file)
--- 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 ba424b897d003ac567fab38369a5d77156648c49..7838b99c44675eb1ed116ef1f68717b873b5f044 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-27  Philippe Normand  <pnormand@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@moiji-mobile.com>
 
         Reviewed by Adam Barth.

diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index f50cab42163eb2ea3e21e7f0f50da852e5031bc8..9f97fa93b4405e151e8668384b9d791128da31f5 100644 (file)
--- 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