[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - external/curl

[Mike Kaganski]

 external/curl/ExternalProject_curl.mk |    2 +-
 external/curl/curl-msvc.patch.1       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 16dc1fe6ff6e4303ec2c7a461e907bbeecf534cc
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Fri May 25 05:31:27 2018 +0100

    Define _USING_V110_SDK71_ conditionally
    
    This reverts commit 331e325b8229976312129daa1bc94a584104cb07.
    
    Change-Id: I4935d2cf62309776fee445d4babd42b5e385762a
    Reviewed-on: https://gerrit.libreoffice.org/54788
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 1b7dd05e519e..c12a5cf19c7d 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -70,7 +70,7 @@ else ifeq ($(COM),MSC)
 
 $(call gb_ExternalProject_get_state_target,curl,build):
 	$(call gb_ExternalProject_run,build,\
-		CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \
+		CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC)) $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),/D_USING_V110_SDK71_)" \
 		MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc \
 			mode=dll \
 			VC=12 \
diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1
index 8ea8530454ad..80160958c99d 100644
--- a/external/curl/curl-msvc.patch.1
+++ b/external/curl/curl-msvc.patch.1
@@ -7,7 +7,7 @@ MSVC: using SOLARINC
  CC_NODEBUG  = $(CC) /O2 /DNDEBUG
  CC_DEBUG    = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd
 -CFLAGS      = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL
-+CFLAGS      = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL $(SOLARINC) /D_USING_V110_SDK71_
++CFLAGS      = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL $(SOLARINC)
  !ENDIF
  
  LFLAGS     = /nologo /machine:$(MACHINE)