[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_ado.mk connectivity/Library_ado.mk

[David Ostrovsky]

 connectivity/CppunitTest_connectivity_ado.mk |    2 +-
 connectivity/Library_ado.mk                  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 28b6325901138a6267320902ec889fc434ddde91
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Wed Jul 9 07:13:04 2014 +0200

    VS2013: Make ADO backwards compatible for SDK > 8.0
    
    Change-Id: I2e607156831321cc0ea5c3030befb635c5acaed1
    Reviewed-on: https://gerrit.libreoffice.org/10156
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk
index ff090c4..1102d27 100644
--- a/connectivity/CppunitTest_connectivity_ado.mk
+++ b/connectivity/CppunitTest_connectivity_ado.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_add_cxxflags,connectivity_ado,\
 ))
 endif
 
-ifeq ($(WINDOWS_SDK_VERSION),80)
+ifneq (,$(filter $(WINDOWS_SDK_VERSION),80 81))
 $(eval $(call gb_CppunitTest_add_defs,connectivity_ado,\
 	-DNTDDI_VERSION=0x0601 \
 ))
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index 054c478..dbe53b4 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_defs,ado,\
 ))
 endif
 
-ifeq ($(WINDOWS_SDK_VERSION),80)
+ifneq (,$(filter $(WINDOWS_SDK_VERSION),80 81))
 $(eval $(call gb_Library_add_defs,ado,\
 	-DNTDDI_VERSION=0x0601 \
 ))