summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-02-28 09:50:45 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-02-28 12:32:58 +0100
commit936d7a4e49c3274018354989883101e74c77fc9c (patch)
treef1cc85caa919671b83a686d6de63327fb8031f54 /basic
parent64a87cc3fcbc782ffd0a72c5d552279c2dc3b474 (diff)
Remove dead condition
The original $(if $(filter 140,$(VCVER)),legacy_stdio_definitions) had been added with d2a44e62704f185a0acecbb6320b92a4df3063b9 "tdf#99696 fix build error for 64bit Windows in unit tests using ADODB" at a time when configure.ac supported VCVER=120 (i.e., VS 2013) and VCVER=140 (i.e., VS 2015). It was presumably meant to express the condition $(VCVER) >= 140 which is always true by now (where our baseline is already at VCVER=150, i.e., VS 2017). Change-Id: I1cd48604d102c32e1d829395b65a00539f318b6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89686 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'basic')
-rw-r--r--basic/CppunitTest_basic_macros.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/basic/CppunitTest_basic_macros.mk b/basic/CppunitTest_basic_macros.mk
index 5149bf7575da..6cce94737113 100644
--- a/basic/CppunitTest_basic_macros.mk
+++ b/basic/CppunitTest_basic_macros.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \
ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_macros, \
oleaut32 \
- $(if $(filter 150 160,$(VCVER)),legacy_stdio_definitions) \
+ legacy_stdio_definitions \
odbc32 \
odbccp32 \
))