[Libreoffice-commits] core.git: basic/CppunitTest_basic_macros.mk

[Stephan Bergmann (via logerrit)]

 basic/CppunitTest_basic_macros.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 936d7a4e49c3274018354989883101e74c77fc9c
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Feb 28 09:50:45 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Feb 28 12:32:58 2020 +0100

    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 at redhat.com>

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 \
 ))