wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 582783 - Move windows.h include and undef LoadImage to gfxWindowsSurface.h. r=joe

Browse Source
This commit is contained in:
Mina Almasry 2013-03-25 17:53:54 -04:00
parent 431196b4a4
commit 797287a144
4 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/thebes/gfxWindowsSurface.h
View File

@ -9,7 +9,10 @@
#include "gfxASurface.h"
#include "gfxImageSurface.h"
/* include windows.h for the HWND and HDC definitions that we need. */
#include <windows.h>
/* undefine LoadImage because our code uses that name */
#undef LoadImage
class gfxContext;

8
image/build/nsImageModule.cpp
View File

@ -9,14 +9,6 @@
#include "RasterImage.h"
/* We end up pulling in windows.h because we eventually hit gfxWindowsSurface;
* windows.h defines LoadImage, so we have to #undef it or imgLoader::LoadImage
* gets changed.
* This #undef needs to be in multiple places because we don't always pull
* headers in in the same order.
*/
#undef LoadImage
#include "imgLoader.h"
#include "imgRequest.h"
#include "imgRequestProxy.h"

7
image/src/imgLoader.cpp
View File

@ -12,13 +12,6 @@
#include "imgRequestProxy.h"
#include "RasterImage.h"
/* We end up pulling in windows.h because we eventually hit gfxWindowsSurface;
* windows.h defines LoadImage, so we have to #undef it or imgLoader::LoadImage
* gets changed.
* This #undef needs to be in multiple places because we don't always pull
* headers in in the same order.
*/
#undef LoadImage
#include "nsCOMPtr.h"

8
image/src/imgRequest.cpp
View File

@ -7,14 +7,6 @@
#include "imgRequest.h"
#include "ImageLogging.h"
/* We end up pulling in windows.h because we eventually hit gfxWindowsSurface;
* windows.h defines LoadImage, so we have to #undef it or imgLoader::LoadImage
* gets changed.
* This #undef needs to be in multiple places because we don't always pull
* headers in in the same order.
*/
#undef LoadImage
#include "imgLoader.h"
#include "imgRequestProxy.h"
#include "imgStatusTracker.h"