411102 - Undefine the LoadImage in nsSVGFilters.cpp instead of the whole user32.dll API

Status: RESOLVED FIXED

(Core :: SVG, defect)

Description

[Bo Yang]

Attachment: Little patch

When I cross build Mozilla trunk today, I find that it failed because the below lines in mozilla/content/svg/content/src/nsSVGFilters.cpp

#if defined(XP_WIN) && !defined(NOUSER)
// Prevent Windows redefining LoadImage
#define NOUSER
#endif

I find that the author want to use this to avoid the conflict between the member function LoadImage used in this file with the Windows version LoadImage macro. But unfortunately, there is no such NOUSRE guard in MinGW w32api, so my build failed. After some thought, I think the following code do the same thing and are more clear than the above lines.

#if defined(XP_WIN)
// Prevent Windows redefining LoadImage
#undef LoadImage
#endif

It undef the LoadImage and do nothing with the other functions defined in winuser.h. I think it does better. So, I submit this little patch. Wish it helps! Any advice will be appreciated! Thanks!

Comment 1

[Robert Longson [:longsonr]]

I think it would be best to remove this code altogether in nsSVGFilters and do something with the windows.h include in /mozilla/gfx/thebes/public/gfxWindowsSurface.h to either undef LoadImage or define NOUSER.

Comment 3

[Reed Loden [:reed]]

Checking in content/svg/content/src/nsSVGFilters.cpp;
/cvsroot/mozilla/content/svg/content/src/nsSVGFilters.cpp,v  <--  nsSVGFilters.cpp
new revision: 1.59; previous revision: 1.58
done