Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-adaptor.git] / dali / internal / imaging / common / file-download.h

diff --git a/dali/internal/imaging/common/file-download.h b/dali/internal/imaging/common/file-download.h
index 9c6d419..f807b22 100755 (executable)
--- a/dali/internal/imaging/common/file-download.h
+++ b/dali/internal/imaging/common/file-download.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_NETWORK_FILE_DOWNLOAD_H__
-#define __DALI_TIZEN_PLATFORM_NETWORK_FILE_DOWNLOAD_H__
+#ifndef DALI_TIZEN_PLATFORM_NETWORK_FILE_DOWNLOAD_H
+#define DALI_TIZEN_PLATFORM_NETWORK_FILE_DOWNLOAD_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 #include <string>
 #include <mutex> //c++11
 #include <stdint.h> // uint8
+#include <openssl/crypto.h>
 
 namespace Dali
 {
@@ -67,11 +68,7 @@ public:
   /**
    * Gets thread id for libcurl with openssl
    */
-  static unsigned long GetThreadId();
-
-  static void ConfigureCurlOptions( void* curlHandle, const std::string& url );
-
-  static void InitWriteFunction( void* curlHandle );
+  static void GetThreadId( CRYPTO_THREADID* tid );
 
 private:
 
@@ -108,4 +105,4 @@ bool DownloadRemoteFileIntoMemory( const std::string& url,
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_IMAGE_H__
+#endif // DALI_TIZEN_PLATFORM_RESOURCE_THREAD_IMAGE_H