From ff17c5a2b06367e9fdeff2d5763ccaeb9725511f Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 10 Dec 2014 17:45:00 +0100
Subject: [PATCH] canvas: remove Windows SDK #ifdefs - all supported MSVC/SDK
 have DirectX

Change-Id: I5106593ad5472992e3607665849fb35802b6e266
---
 canvas/Library_directx9canvas.mk       |  6 ------
 canvas/Library_gdipluscanvas.mk        |  6 ------
 canvas/StaticLibrary_directxcanvas.mk  |  6 ------
 canvas/source/directx/dx_winstuff.hxx  | 20 ++------------------
 solenv/gbuild/platform/com_MSC_defs.mk |  1 -
 5 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 2b90429ebcfb..5621ceecbe8e 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -29,12 +29,6 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\
 	-UNOMINMAX \
 ))
 
-ifneq ($(filter 80 81,$(WINDOWS_SDK_VERSION)),)
-$(eval $(call gb_Library_add_defs,directx9canvas,\
-	-DWIN8_SDK=1 \
-))
-endif
-
 $(eval $(call gb_Library_use_external,directx9canvas,boost_headers))
 
 $(eval $(call gb_Library_use_libraries,directx9canvas,\
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 858c6de73a7e..2e12d4dd0e24 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -31,12 +31,6 @@ $(eval $(call gb_Library_add_defs,gdipluscanvas,\
 	-UNOMINMAX \
 ))
 
-ifneq ($(filter 80 81,$(WINDOWS_SDK_VERSION)),)
-$(eval $(call gb_Library_add_defs,gdipluscanvas,\
-	-DWIN8_SDK=1 \
-))
-endif
-
 ifneq ($(strip $(VERBOSE)$(verbose)),)
 $(eval $(call gb_Library_add_defs,gdipluscanvas,\
 	-DVERBOSE \
diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk
index dabe9c3bc976..da7f380a7a39 100644
--- a/canvas/StaticLibrary_directxcanvas.mk
+++ b/canvas/StaticLibrary_directxcanvas.mk
@@ -23,12 +23,6 @@ $(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
 	-UNOMINMAX \
 ))
 
-ifneq ($(filter 80 81,$(WINDOWS_SDK_VERSION)),)
-$(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-	-DWIN8_SDK=1 \
-))
-endif
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,directxcanvas,\
 	canvas/source/directx/dx_bitmap \
 	canvas/source/directx/dx_bitmapcanvashelper \
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 469b5cbc9e95..b7c9d8e3f74d 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -56,26 +56,10 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#if WIN8_SDK == 1 || defined(_USING_V110_SDK71_)
+#include <d3d9.h>
 
-    #include <d3d9.h>
+typedef IDirect3DSurface9 surface_type;
 
-    typedef IDirect3DSurface9 surface_type;
-
-#else
-
-    #include <dxsdkver.h>
-    #include <d3d9.h>
-    #include <d3dx9.h>
-    #if _DXSDK_BUILD_MAJOR < 1734 /* Earlier than the August 2009 DXSDK */
-        #include <dxerr9.h>
-    #else
-        #include <dxerr.h>
-    #endif
-
-    typedef IDirect3DSurface9 surface_type;
-
-#endif
 
 #undef DrawText
 
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 7590a7bd1882..396163c90f38 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -47,7 +47,6 @@ gb_COMPILERDEFS := \
 	-D_MT \
 	-D_DLL \
 	-DCPPU_ENV=$(gb_CPPU_ENV) \
-	$(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \
 
 ifeq ($(CPUNAME),INTEL)
 gb_COMPILERDEFS += \