diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-25 01:32:10 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-25 01:52:16 +0200 |
| commit | eb841ee60977024af788f8c5821d8c5558faad4b (patch) | |
| tree | fca6d57cb78fff94048a769d40cc1a712e4df5c0 /canvas/source/directx/dx_winstuff.hxx | |
| parent | 53b28adfef3fdd8e043b4890a5a1b5b166bd11d9 (diff) | |
Work around compilation errors on 64-bit Windows
Again the ULONG clashes on 64-bit Windows cause pain. Work around by
using pre/postwin.h, and that then necessitates use of explict
WIN_BYTE instead of just BYTE. Sigh...
Diffstat (limited to 'canvas/source/directx/dx_winstuff.hxx')
| -rw-r--r-- | canvas/source/directx/dx_winstuff.hxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index e5133de1b8e2..ef43cbe742f2 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -66,7 +66,7 @@ #undef WB_RIGHT #define WIN32_LEAN_AND_MEAN -#include <windows.h> // TODO(Q1): extract minimal set of required headers for gdiplus +#include <tools/prewin.h> #if DIRECTX_VERSION < 0x0900 @@ -107,6 +107,8 @@ using ::std::min; #include <gdiplus.h> +#include <tools/postwin.h> + #ifdef min # undef min #endif @@ -216,12 +218,6 @@ namespace dxcanvas #pragma warning(pop) #endif -#undef DELETE -#undef BOOL -#undef INT32 -#undef UINT32 -#undef PolyPolygon - #endif /* _DXCANVAS_WINSTUFF_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |