From b7ececdc0b7f5a59abbe0cee35b6aecf67bf4eb9 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Thu, 19 Feb 2015 14:24:57 +0100
Subject: [PATCH] COMP: waiting for CurlHelper rework, enable curl to avoid
segfault in ioTvImageFileReaderServerNameHTTPTest
---
.../Adapters/CurlAdapters/src/otbCurlHelper.cxx | 14 ++++----------
.../CurlAdapters/src/otbCurlHelperInterface.cxx | 1 +
Modules/ThirdParty/Curl/src/otb_curl.h.in | 1 +
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx b/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx
index bae7e15f75..a139e079da 100644
--- a/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx
+++ b/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx
@@ -16,19 +16,13 @@
=========================================================================*/
-#include "otbCurlHelper.h"
-
+#include <cstdio>
#include <sstream>
-
+#include <itkLightObject.h>
+#include "otb_curl.h"
+#include "otbCurlHelper.h"
#include "otbMacro.h"
-#ifdef OTB_USE_CURL
-#include <curl/curl.h>
-#include <cstring>
-#endif
-
-#include <cstdio>
-#include <itkLightObject.h>
namespace otb
{
diff --git a/Modules/Adapters/CurlAdapters/src/otbCurlHelperInterface.cxx b/Modules/Adapters/CurlAdapters/src/otbCurlHelperInterface.cxx
index 54c8605c63..29a98b9eef 100644
--- a/Modules/Adapters/CurlAdapters/src/otbCurlHelperInterface.cxx
+++ b/Modules/Adapters/CurlAdapters/src/otbCurlHelperInterface.cxx
@@ -16,6 +16,7 @@
=========================================================================*/
+#include "otb_curl.h"
#include "otbCurlHelperInterface.h"
namespace otb {
diff --git a/Modules/ThirdParty/Curl/src/otb_curl.h.in b/Modules/ThirdParty/Curl/src/otb_curl.h.in
index 1617c168a1..6d221b7a92 100644
--- a/Modules/ThirdParty/Curl/src/otb_curl.h.in
+++ b/Modules/ThirdParty/Curl/src/otb_curl.h.in
@@ -17,6 +17,7 @@
=========================================================================*/
#ifndef __otb_curl_h
+#define OTB_USE_CURL 1
#cmakedefine OTB_CURL_MULTI_AVAILABLE
#include <curl/curl.h>
--
GitLab