Title: [146020] releases/WebKitGTK/webkit-2.0
- Revision
- 146020
- Author
- [email protected]
- Date
- 2013-03-17 11:12:25 -0700 (Sun, 17 Mar 2013)
Log Message
Merge 144990 - Build fix. Fixes problems building code that uses deprecated functions from GTK+ 2,
such as RenderThemeGtk2.cpp, in debug mode. RenderThemeGtk2.cpp tries to allow usage
of deprecated functions by undefining GTK_DISABLE_DEPRECATED, but it ended up being
redefined because autotoolsconfig.h was included again by headers that came after
config.h.
Reviewed by Martin Robinson.
* Source/autotools/SetupWebKitFeatures.m4: add checks to ensure the
autotoolsconfig.h header is only included once.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/ChangeLog (146019 => 146020)
--- releases/WebKitGTK/webkit-2.0/ChangeLog 2013-03-17 18:11:49 UTC (rev 146019)
+++ releases/WebKitGTK/webkit-2.0/ChangeLog 2013-03-17 18:12:25 UTC (rev 146020)
@@ -1,3 +1,16 @@
+2013-03-06 Gustavo Noronha Silva <[email protected]>
+
+ Build fix. Fixes problems building code that uses deprecated functions from GTK+ 2,
+ such as RenderThemeGtk2.cpp, in debug mode. RenderThemeGtk2.cpp tries to allow usage
+ of deprecated functions by undefining GTK_DISABLE_DEPRECATED, but it ended up being
+ redefined because autotoolsconfig.h was included again by headers that came after
+ config.h.
+
+ Reviewed by Martin Robinson.
+
+ * Source/autotools/SetupWebKitFeatures.m4: add checks to ensure the
+ autotoolsconfig.h header is only included once.
+
2013-03-14 Carlos Garcia Campos <[email protected]>
Unreviewed. Pre-release version bump.
Modified: releases/WebKitGTK/webkit-2.0/Source/autotools/SetupWebKitFeatures.m4 (146019 => 146020)
--- releases/WebKitGTK/webkit-2.0/Source/autotools/SetupWebKitFeatures.m4 2013-03-17 18:11:49 UTC (rev 146019)
+++ releases/WebKitGTK/webkit-2.0/Source/autotools/SetupWebKitFeatures.m4 2013-03-17 18:12:25 UTC (rev 146020)
@@ -1,5 +1,13 @@
+AH_TOP([
+#ifndef __AUTOTOOLSCONFIG_H__
+#define __AUTOTOOLSCONFIG_H__ 1
+])
+
# This adds the include line to the bottom of the autoconfig header.
-AH_BOTTOM([#include "WebKitFeatures.h"])
+AH_BOTTOM([
+#include "WebKitFeatures.h"
+#endif // __AUTOTOOLSCONFIG_H__
+])
# This list of features represents those selected for release builds.
# If you are adding a new or unstable feature, you should mark it
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
