Title: [135312] trunk/Source/WebCore
- Revision
- 135312
- Author
- [email protected]
- Date
- 2012-11-20 14:25:33 -0800 (Tue, 20 Nov 2012)
Log Message
[Qt] Build fix after r135217.
https://bugs.webkit.org/show_bug.cgi?id=102787
* platform/win/WindowsExtras.h: Add #undef of NOSHLWAPI to
allow include of <ObjBase.h> needed by Qt build.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135311 => 135312)
--- trunk/Source/WebCore/ChangeLog 2012-11-20 22:25:14 UTC (rev 135311)
+++ trunk/Source/WebCore/ChangeLog 2012-11-20 22:25:33 UTC (rev 135312)
@@ -1,3 +1,11 @@
+2012-11-20 Brent Fulgham <[email protected]>
+
+ [Qt] Build fix after r135217.
+ https://bugs.webkit.org/show_bug.cgi?id=102787
+
+ * platform/win/WindowsExtras.h: Add #undef of NOSHLWAPI to
+ allow include of <ObjBase.h> needed by Qt build.
+
2012-11-20 Sheriff Bot <[email protected]>
Unreviewed, rolling out r135295.
Modified: trunk/Source/WebCore/platform/win/WindowsExtras.h (135311 => 135312)
--- trunk/Source/WebCore/platform/win/WindowsExtras.h 2012-11-20 22:25:14 UTC (rev 135311)
+++ trunk/Source/WebCore/platform/win/WindowsExtras.h 2012-11-20 22:25:33 UTC (rev 135312)
@@ -26,6 +26,7 @@
#define WindowsExtras_h
#include <windows.h>
+#undef NOSHLWAPI
#include <shlwapi.h>
namespace WebCore {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
