diff options
| author | thb <thb@openoffice.org> | 2010-02-19 12:46:18 +0100 |
|---|---|---|
| committer | thb <thb@openoffice.org> | 2010-02-19 12:46:18 +0100 |
| commit | 0755c94f9a36f7ccd23a52a58297033a05b10c80 (patch) | |
| tree | b024ba02a0b81f5a59eac8192f211b5a512ea513 /canvas | |
| parent | 7ffd813fd3f0c4ec1e6b6f168acf94a6c3246a58 (diff) | |
| parent | da2c680d23b67d4721aa29f740475fd6d40e2e08 (diff) | |
Merged with dev300_m71
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 |