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

This commit is contained in:
Robert O'Callahan 2014-03-12 09:11:37 +08:00
parent bc8977d790
commit 2d8a0a424b
2 changed files with 6 additions and 1 deletions

View File

@ -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

View File

@ -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
{