diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-01-04 17:04:05 +0100 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-01-04 17:04:05 +0100 |
| commit | 3107778b2e96dfe72298d9a7eda8eca59b789a12 (patch) | |
| tree | 209bea4af6dc7ece287ab35a7e870610c452fb4f /canvas/source | |
| parent | 0c5348ff2c5cede4607555fdab45642db10b07ba (diff) | |
| parent | 45e8e0fbee40f9a8d91f4c559c8bbb16dd7b3f36 (diff) | |
merging m68
Diffstat (limited to 'canvas/source')
| -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 |