[Libreoffice-commits] core.git: canvas/source

[Riccardo Magliocchetti]

 canvas/source/directx/dx_winstuff.hxx |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

New commits:
commit abb8ce43ab30373d1283b9085ed65191c437978e
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Mon Dec 8 11:11:37 2014 +0100

    Kill unused directx < 9 ifdefery
    
    Change-Id: I2cd5dd5b4f723e26802930003c68433917af782d
    Reviewed-on: https://gerrit.libreoffice.org/13371
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 86ecacd..469b5cb 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -56,22 +56,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#if DIRECTX_VERSION < 0x0900
-
-    #include <multimon.h>
-
-    // Be compatible with directdraw 3.0. Lets see how far this takes us
-    #define DIRECTDRAW_VERSION 0x0300
-    #include <ddraw.h>
-
-    // Be compatible with direct3d 5.0. Lets see how far this takes us
-    #define DIRECT3D_VERSION 0x0500
-    #define D3D_OVERLOADS
-    #include <d3d.h>
-
-    typedef IDirectDrawSurface surface_type;
-
-#elif WIN8_SDK == 1 || defined(_USING_V110_SDK71_)
+#if WIN8_SDK == 1 || defined(_USING_V110_SDK71_)
 
     #include <d3d9.h>