Bug 917755. Part 1.5: Make nsImageLoadingContent more robust in unified builds. r=matspal
☠☠ backed out by 3a4c53359257 ☠ ☠
authorRobert O'Callahan <robert@ocallahan.org>
Wed, 12 Mar 2014 09:11:37 +0800
changeset 174240 002dbc057a74f3e37641388d4b5dd3a05e4696b6
parent 174239 094decae8ff3c7be54f7302dfe29c8beb653f7a4
child 174241 92e5d79ec57ff2b19e1d0ffb13b7d8032a48b222
push id41230
push userrocallahan@mozilla.com
push dateWed, 19 Mar 2014 06:26:26 +0000
treeherdermozilla-inbound@2f3187619c9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmatspal
bugs917755
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 917755. Part 1.5: Make nsImageLoadingContent more robust in unified builds. r=matspal
content/base/src/nsImageLoadingContent.cpp
content/base/src/nsImageLoadingContent.h
--- a/content/base/src/nsImageLoadingContent.cpp
+++ b/content/base/src/nsImageLoadingContent.cpp
@@ -42,17 +42,17 @@
 #include "nsIContentPolicy.h"
 #include "nsSVGEffects.h"
 
 #include "mozAutoDocUpdate.h"
 #include "mozilla/AsyncEventDispatcher.h"
 #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
 
 using namespace mozilla;
 
 #ifdef DEBUG_chb
 static void PrintReqURL(imgIRequest* req) {
--- a/content/base/src/nsImageLoadingContent.h
+++ b/content/base/src/nsImageLoadingContent.h
@@ -26,16 +26,21 @@
 class nsIURI;
 class nsIDocument;
 class imgILoader;
 class nsIIOService;
 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
 {
   /* METHODS */
 public:
   nsImageLoadingContent();
   virtual ~nsImageLoadingContent();