CWS svxsplit: merge with m71

2010-02-04 17:59:58 +01:00
parent 1153489dc1 da2c680d23
commit 509f78fb1d
232 changed files with 2787 additions and 1406 deletions
--- 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