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

Mike Kaganski mikekaganski at collabora.com
Thu May 24 21:27:23 UTC 2018


 external/curl/curl-msvc.patch.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 331e325b8229976312129daa1bc94a584104cb07
Author: Mike Kaganski <mikekaganski at collabora.com>
Date:   Thu May 24 14:20:08 2018 -0700

    Fix build with SDK 7.1A
    
    Change-Id: I2031b8c162d6fdb666d6f6d0daec205b88190370
    Reviewed-on: https://gerrit.libreoffice.org/54782
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1
index 80160958c99d..8ea8530454ad 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)
++CFLAGS      = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL $(SOLARINC) /D_USING_V110_SDK71_
  !ENDIF
  
  LFLAGS     = /nologo /machine:$(MACHINE)


More information about the Libreoffice-commits mailing list