Bug 942217 - Undefine LoadImage to prevent naming conflict on Windows. r=ehsan

content/base/public/nsContentUtils.h

@@ -27,6 +27,11 @@
 #include "nsMathUtils.h"
 #include "Units.h"
 
+#if defined(XP_WIN)
+// Undefine LoadImage to prevent naming conflict with Windows.
+#undef LoadImage
+#endif
+
 class imgICache;
 class imgIContainer;
 class imgINotificationObserver;

content/base/src/nsImageLoadingContent.cpp

@@ -48,6 +48,11 @@
 #include "mozAutoDocUpdate.h"
 #include "mozilla/dom/Element.h"
 
+#if defined(XP_WIN)
+// Undefine LoadImage to prevent naming conflict with Windows.
+#undef LoadImage
+#endif
+
 using namespace mozilla;
 
 #ifdef DEBUG_chb