Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-31 22:25:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robert O'Callahan 2014-03-12 09:11:37 +08:00
parent 337e06fd00
commit af32237754
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/base/src/nsImageLoadingContent.cpp
View File

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

5
content/base/src/nsImageLoadingContent.h
View File

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