diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-07 23:35:45 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-08-02 16:43:42 +0300 |
| commit | de9911795e9f0caaf8652b7c473b0c86e8a5a1bd (patch) | |
| tree | 9c37c85d6aa0fffbc580d3a15deda93e65d48775 | |
| parent | a30109f4dd789eab623c82a82ebc4ae3c85d2832 (diff) | |
tdf#100295 try to cover second place in curl using GetTickCount64
Conflicts:
external/curl/ExternalProject_curl.mk
Change-Id: I08e51f70c7b0c92a8c1b8b06e7eb2f1437e2f3f4
Reviewed-on: https://gerrit.libreoffice.org/27027
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 6efd6c49003987a58c83bc23d6a3fbb67999ff9e)
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 9dd4a07b4d82..d91b61cd824f 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -81,7 +81,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc10 \ cfg=$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \ - EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ + EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI /D_USING_V110_SDK71_ $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ ,lib) endif |