diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-01-26 16:17:30 +0100 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-01-26 16:17:30 +0100 |
| commit | 20c9b2305c7f9c2341961a1aa32bdc151aead3b4 (patch) | |
| tree | 0bd3c6123baef73e15de01001c552d20f84f9a90 /canvas | |
| parent | 6c662eef5c3516155b001865a3512f8ca705390a (diff) | |
| parent | 81f4386da532ba62e5e2381e57485197ce5da0bf (diff) | |
CWS-TOOLING: integrate CWS impress181
Diffstat (limited to 'canvas')
| -rwxr-xr-x | canvas/source/directx/dx_winstuff.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 1c64506c0f21..47658991e74b 100755 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -89,7 +89,7 @@ #include <d3d9.h> #include <d3dx9.h> - #include <dxerr9.h> +// #include <dxerr9.h> #i107614# removing include, it has been changed in the latest sdk fron August2009 from dxerr9.h into dxerr.h typedef IDirect3DSurface9 surface_type; @@ -97,11 +97,11 @@ #undef DrawText -#ifdef __MINGW32__
-using ::std::max;
-using ::std::min;
-#endif
-
+#ifdef __MINGW32__ +using ::std::max; +using ::std::min; +#endif + #include <gdiplus.h> #ifdef min |