summaryrefslogtreecommitdiff
path: root/canvas/source
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-02-04 17:59:58 +0100
committerMathias Bauer <mba@openoffice.org>2010-02-04 17:59:58 +0100
commit509f78fb1dfb021c48510075680d2b3aa01681cc (patch)
treefbf70fea1551a1640e16bf74510942089bcb14c1 /canvas/source
parent1153489dc129ff4d4b26fbf39f154b3833f423f4 (diff)
parentda2c680d23b67d4721aa29f740475fd6d40e2e08 (diff)
CWS svxsplit: merge with m71
Diffstat (limited to 'canvas/source')
-rwxr-xr-xcanvas/source/directx/dx_winstuff.hxx12
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