Bug 917755. Part 1.5: Make nsImageLoadingContent more robust in unified builds. r=matspal

--HG--
extra : rebase_source : be9acaac5b213666d02d1f6a95f132c46a7ada48

content/base/src/nsImageLoadingContent.cpp

@@ -47,7 +47,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ScriptSettings.h"
 
-#if defined(XP_WIN)
+#ifdef LoadImage
 // Undefine LoadImage to prevent naming conflict with Windows.
 #undef LoadImage
 #endif

content/base/src/nsImageLoadingContent.h

@@ -31,6 +31,11 @@ class nsPresContext;
 class nsIContent;
 class imgRequestProxy;
 
+#ifdef LoadImage
+// Undefine LoadImage to prevent naming conflict with Windows.
+#undef LoadImage
+#endif
+
 class nsImageLoadingContent : public nsIImageLoadingContent,
                               public imgIOnloadBlocker
 {