From 9a737d75260c35e42d158bf5df5f2fcc161c410a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 4 Aug 2016 00:40:22 +0200 Subject: [PATCH] completion of 1d14f8630a990666103eab24a0aa58b5bdcb3331 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bb5bdc0066163abc7bd3714964afbca8436bdaf2 Author: vanhofen Date: 2016-08-04 (Thu, 04 Aug 2016) Origin message was: ------------------ - completion of 1d14f8630a990666103eab24a0aa58b5bdcb3331 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/system/httptool.cpp | 2 +- src/system/httptool.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/httptool.cpp b/src/system/httptool.cpp index aaa8626fe..72314f10d 100644 --- a/src/system/httptool.cpp +++ b/src/system/httptool.cpp @@ -58,7 +58,7 @@ int CHTTPTool::show_progress( void *clientp, double dltotal, double dlnow, doubl return 0; } //#define DEBUG -bool CHTTPTool::downloadFile(const std::string & URL, const char * const downloadTarget, int globalProgressEnd,/*NI*/int connecttimeout,/*NI*/int timeout) +bool CHTTPTool::downloadFile(const std::string & URL, const char * const downloadTarget, int globalProgressEnd, int connecttimeout, int timeout) //NI { CURL *curl; CURLcode res; diff --git a/src/system/httptool.h b/src/system/httptool.h index a414d683b..93e04a4f2 100644 --- a/src/system/httptool.h +++ b/src/system/httptool.h @@ -51,7 +51,7 @@ class CHTTPTool CHTTPTool(); void setStatusViewer( CProgressWindow* statusview ); - bool downloadFile( const std::string & URL, const char * const downloadTarget, int globalProgressEnd=-1,/*NI*/int connecttimeout=10,/*NI*/int timeout=1800); + bool downloadFile( const std::string & URL, const char * const downloadTarget, int globalProgressEnd=-1, int connecttimeout=10, int timeout=1800); //NI };