[Scummvm-git-logs] scummvm master -> 1584c3641069cbb0caa0d7c321ae9fcc76226ab2

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1584c36410 NETWORKING: Fix compilation for lower versions of libcurl


Commit: 1584c3641069cbb0caa0d7c321ae9fcc76226ab2
    https://github.com/scummvm/scummvm/commit/1584c3641069cbb0caa0d7c321ae9fcc76226ab2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-05T21:42:53+01:00

Commit Message:
NETWORKING: Fix compilation for lower versions of libcurl

Changed paths:
    backends/networking/curl/networkreadstream.cpp


diff --git a/backends/networking/curl/networkreadstream.cpp b/backends/networking/curl/networkreadstream.cpp
index 06f4dc5..09b9d80 100644
--- a/backends/networking/curl/networkreadstream.cpp
+++ b/backends/networking/curl/networkreadstream.cpp
@@ -108,11 +108,14 @@ void NetworkReadStream::initCurl(const char *url, curl_slist *headersList) {
 	curl_easy_setopt(_easy, CURLOPT_XFERINFODATA, this);
 #endif
 
+#if LIBCURL_VERSION_NUM >= 0x071900
+	// Added in libcurl 7.25.0
 	if (_keepAlive) {
 		curl_easy_setopt(_easy, CURLOPT_TCP_KEEPALIVE, 1L);
 		curl_easy_setopt(_easy, CURLOPT_TCP_KEEPIDLE, _keepAliveIdle);
 		curl_easy_setopt(_easy, CURLOPT_TCP_KEEPINTVL, _keepAliveInterval);
 	}
+#endif
 }
 
 bool NetworkReadStream::reuseCurl(const char *url, curl_slist *headersList) {
@@ -212,7 +215,7 @@ bool NetworkReadStream::reuse(const char *url, curl_slist *headersList, Common::
 	if (!reuseCurl(url, headersList))
 		return false;
 
-	_backingStream = Common::MemoryReadWriteStream(DisposeAfterUse::YES);	
+	_backingStream = Common::MemoryReadWriteStream(DisposeAfterUse::YES);
 	setupBufferContents((const byte *)postFields.c_str(), postFields.size(), uploading, usingPatch, false);
 	return true;
 }
@@ -231,7 +234,7 @@ bool NetworkReadStream::reuse(const char *url, curl_slist *headersList, const by
 		return false;
 
 	_backingStream = Common::MemoryReadWriteStream(DisposeAfterUse::YES);
-	setupBufferContents(buffer, bufferSize, uploading, usingPatch, post);	
+	setupBufferContents(buffer, bufferSize, uploading, usingPatch, post);
 	return true;
 }