2011-02-08 Alejandro G. Castro <alex@igalia.com>

        Reviewed by Martin Robinson.

        WebKit2 GTK Fails to Build #include nested too deeply
        https://bugs.webkit.org/show_bug.cgi?id=52219

        * GNUmakefile.am: Removed the commands to create the directories
        for the forwarding headers, the script already does it for us.
        * config.h: Removed the config.h inclusion and added the
        autotoolsconfig.h directly, also added a condition to share the
        defines with QT.

2011-02-08  Alejandro G. Castro  <alex@igalia.com>

        Reviewed by Martin Robinson.

        WebKit2 GTK Fails to Build #include nested too deeply
        https://bugs.webkit.org/show_bug.cgi?id=52219

        Removed the __STDC_FORMAT_MACROS definition, it is already defined
        in the file where PRIxx64 is used before the inclusion so we are
        safe.

        * configure.ac:

git-svn-id: svn://svn.chromium.org/blink/trunk@78020 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/ChangeLog

+2011-02-08  Alejandro G. Castro  <alex@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        WebKit2 GTK Fails to Build #include nested too deeply
+        https://bugs.webkit.org/show_bug.cgi?id=52219
+
+        Removed the __STDC_FORMAT_MACROS definition, it is already defined
+        in the file where PRIxx64 is used before the inclusion so we are
+        safe.
+
+        * configure.ac:
+
 2011-02-08  Kristian Amlie  <kristian.amlie@nokia.com>
 
         Reviewed by Eric Seidel.

third_party/WebKit/Source/WebKit2/ChangeLog

+2011-02-08  Alejandro G. Castro  <alex@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        WebKit2 GTK Fails to Build #include nested too deeply
+        https://bugs.webkit.org/show_bug.cgi?id=52219
+
+        * GNUmakefile.am: Removed the commands to create the directories
+        for the forwarding headers, the script already does it for us.
+        * config.h: Removed the config.h inclusion and added the
+        autotoolsconfig.h directly, also added a condition to share the
+        defines with QT.
+
 2011-02-08  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Mark Rowe.

third_party/WebKit/Source/WebKit2/GNUmakefile.am

@@ -779,9 +779,6 @@ BUILT_SOURCES += \
 
 forwarding_headers := $(GENSOURCES_WEBKIT2)/include
 generate-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(libWebKit2_la_SOURCES)
-	$(AM_V_at)$(mkdir_p) $(forwarding_headers)/JavaScriptCore
-	$(AM_V_at)$(mkdir_p) $(forwarding_headers)/WebCore
-	$(AM_V_at)$(mkdir_p) $(forwarding_headers)/WebKit2
 	$(AM_V_GEN)$(PERL) $< $(WebKit2) $(forwarding_headers) gtk
 	$(AM_V_GEN)$(PERL) $< $(WebKit2) $(forwarding_headers) soup 
 

third_party/WebKit/Source/WebKit2/config.h

@@ -24,6 +24,10 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */ 
 
+#if defined (BUILDING_GTK__)
+#include "autotoolsconfig.h"
+#endif /* defined (BUILDING_GTK__) */
+
 #ifdef __cplusplus
 
 // These undefs match up with defines in WebKit2Prefix.h for Mac OS X.
@@ -34,10 +38,6 @@
 
 #endif
 
-#if defined (BUILDING_GTK__)
-#include <WebCore/config.h>
-#endif /* defined (BUILDING_GTK__) */
-
 #include <wtf/DisallowCType.h>
 #include <wtf/Platform.h>
 
@@ -61,7 +61,7 @@ static const type& name() \
     return name##Value; \
 }
 
-#if defined(BUILDING_QT__)
+#if defined(BUILDING_QT__) || defined(BUILDING_GTK__)
 
 #define WTF_USE_JSC 1
 #define WTF_USE_V8 0

third_party/WebKit/configure.ac

@@ -911,11 +911,6 @@ AC_ARG_ENABLE(webkit2,
                 [], [enable_webkit2="no"])
 AC_MSG_RESULT([$enable_webkit2])
 if test "$enable_webkit2" = "yes"; then
-    # Turn on this macro by default. It is used in inttypes.h for defining macros used by webkit.
-    # In WebKit, this define is ensured by doing it before including config.h in any source file.
-    # In WebKit2, WebKit2Prefix.h is included as first header file, so we need to define this
-    # macro before actually WebKit2Prefix.h is included in any file.
-    AC_DEFINE([__STDC_FORMAT_MACROS],[1],[Turn on the __STDC_FORMAT_MACROS used in inttypes.h])
     WEBKITGTK_PC_NAME=${WEBKITGTK_PC_NAME}2
     AC_SUBST([WEBKITGTK_PC_NAME])
 fi