[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - ucb/source

[Caolán McNamara]

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

New commits:
commit e13db0f16c4ac5a243587e881d7b18979d07f478
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
    (cherry picked from commit 0b8e589875ffd84150470832de18ebd79989efc0)
    Reviewed-on: https://gerrit.libreoffice.org/27513
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
index 25bc26d..5d1cfb5 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
@@ -77,7 +77,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) {