connectivity: remove bogus setting of NTDDI_VERSION

Desktop / LibreOffice - Michael Stahl [redhat.com] - 5 March 2015 08:36 EST

The value set here does not correspond to any valid value in sdkddkver.h; it is a mystery what setting an invalid value is supposed to achieve.

###

diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk
index 1102d27..3160314 100644
--- a/connectivity/CppunitTest_connectivity_ado.mk
+++ b/connectivity/CppunitTest_connectivity_ado.mk
@@ -33,12 +33,6 @@ $(eval $(call gb_CppunitTest_add_cxxflags,connectivity_ado,\
))
endif

-ifneq (,$(filter $(WINDOWS_SDK_VERSION),80 81))
-$(eval $(call gb_CppunitTest_add_defs,connectivity_ado,\
- -DNTDDI_VERSION=0x0601 \
-))
-endif
-
$(eval $(call gb_CppunitTest_add_exception_objects,connectivity_ado, \
connectivity/qa/connectivity/ado/DriverTest \
))
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk
index e9d6e98..146c6af 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -29,12 +29,6 @@ $(eval $(call gb_CppunitTest_add_cxxflags,connectivity_commontools,\
endif
endif

-ifeq ($(WINDOWS_SDK_VERSION),80)
-$(eval $(call gb_CppunitTest_add_defs,connectivity_commontools,\
- -DNTDDI_VERSION=0x0601 \
-))
-endif
-
# In mergedlibs mode we have multiply-defined symbols, which Visual Studio
# does not like. There is no good solution, so just force it.
ifeq ($(COM),MSC)
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index b2ebe1b..c5e74e1 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -36,12 +36,6 @@ $(eval $(call gb_Library_use_system_win32_libs,ado,\
uuid \
))

-ifneq (,$(filter $(WINDOWS_SDK_VERSION),80 81))
-$(eval $(call gb_Library_add_defs,ado,\
- -DNTDDI_VERSION=0x0601 \
-))
-endif
-
$(eval $(call gb_Library_use_libraries,ado,\
cppu \
cppuhelper \

8bb33cb connectivity: remove bogus setting of NTDDI_VERSION
connectivity/CppunitTest_connectivity_ado.mk | 6 ------
.../CppunitTest_connectivity_commontools.mk | 6 ------
connectivity/Library_ado.mk | 6 ------
3 files changed, 18 deletions(-)

Upstream: cgit.freedesktop.org


  • Share