[Libreoffice-commits] core.git: ucb/source

Caolán McNamara caolanm at redhat.com
Mon Jul 25 11:09:34 UTC 2016


 ucb/source/ucp/ftp/ftploaderthread.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0b8e589875ffd84150470832de18ebd79989efc0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 25 12:08:35 2016 +0100

    curl 7.50.0 has CURL as typedef struct Curl_easy
    
    Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4

diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
index be68d9a..315ccb7 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
@@ -71,7 +71,7 @@ FTPLoaderThread::~FTPLoaderThread() {
 
 
 CURL* FTPLoaderThread::handle() {
-    CURL* ret = osl_getThreadKeyData(m_threadKey);
+    CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey));
     if(!ret) {
         ret = curl_easy_init();
         if (ret != nullptr) {


More information about the Libreoffice-commits mailing list