Bug 1313560: Undefine LoadImage in nsPluginFrame.h (alongside other undefines) to prevent windows.h macros from causing unified bustage in other files. rs=dmajor
authorDaniel Holbert <dholbert@cs.stanford.edu>
Fri, 28 Oct 2016 05:59:17 -0700
changeset 346604 6abb6ebe96b7417191c39f28750947ef85f5f618
parent 346603 7c24f445542062d41f97cba2dd8a45bd3a468b98
child 346605 19e79becc54001c1f887133e78ea92d215bad4b9
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmajor
bugs1313560
milestone52.0a1
Bug 1313560: Undefine LoadImage in nsPluginFrame.h (alongside other undefines) to prevent windows.h macros from causing unified bustage in other files. rs=dmajor MozReview-Commit-ID: FKMWw9cW87t
layout/generic/nsPluginFrame.h
--- a/layout/generic/nsPluginFrame.h
+++ b/layout/generic/nsPluginFrame.h
@@ -22,16 +22,17 @@
 #include <windows.h> // For HWND :(
 // Undo the windows.h damage
 #undef GetMessage
 #undef CreateEvent
 #undef GetClassName
 #undef GetBinaryType
 #undef RemoveDirectory
 #undef LoadIcon
+#undef LoadImage
 #undef GetObject
 #endif
 
 class nsPresContext;
 class nsRootPresContext;
 class nsDisplayPlugin;
 class PluginBackgroundSink;
 class nsPluginInstanceOwner;