[ooo-build-commit] .: canvas/source

[Fridrich Strba]

 canvas/source/directx/dx_winstuff.hxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b3593ab95757d5caee760d9dcc6faae2f593627b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Sep 14 12:10:19 2010 +0200

    win32-dxsdk-200908.diff: Build also against DirectX SDK August 2009.

diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 50e38d8..1c3841b 100755
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -84,9 +84,14 @@
 
 #else
 
+    #include <dxsdkver.h>
     #include <d3d9.h>
     #include <d3dx9.h>
-//	#include <dxerr9.h>		#i107614# removing include, it has been changed in the latest sdk fron August2009 from dxerr9.h into dxerr.h
+    #if _DXSDK_BUILD_MAJOR < 1734 /* Earlier than the August 2009 DXSDK */
+        #include <dxerr9.h>
+    #else
+        #include <dxerr.h>
+    #endif
 
     typedef IDirect3DSurface9 surface_type;