Title: [144990] trunk
- Revision
- 144990
- Author
- [email protected]
- Date
- 2013-03-06 15:08:35 -0800 (Wed, 06 Mar 2013)
Log Message
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: trunk/ChangeLog (144989 => 144990)
--- trunk/ChangeLog 2013-03-06 23:04:18 UTC (rev 144989)
+++ trunk/ChangeLog 2013-03-06 23:08:35 UTC (rev 144990)
@@ -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-05 Ryuan Choi <[email protected]>
[EFL] Build break with latest EFL libraries
Modified: trunk/Source/autotools/SetupWebKitFeatures.m4 (144989 => 144990)
--- trunk/Source/autotools/SetupWebKitFeatures.m4 2013-03-06 23:04:18 UTC (rev 144989)
+++ trunk/Source/autotools/SetupWebKitFeatures.m4 2013-03-06 23:08:35 UTC (rev 144990)
@@ -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
