From 4e96e2742a100685b1a233d5f30ccc2b6288358b Mon Sep 17 00:00:00 2001 From: Andreas Huggel Date: Wed, 17 Jun 2015 14:33:29 +0000 Subject: [PATCH] Hack to prevent compiler warning about undefined EXV_USE_CURL. --- include/exiv2/basicio.hpp | 6 +++++- include/exiv2/http.hpp | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/exiv2/basicio.hpp b/include/exiv2/basicio.hpp index 55ff0972..6a8fbf24 100644 --- a/include/exiv2/basicio.hpp +++ b/include/exiv2/basicio.hpp @@ -35,6 +35,10 @@ #define EXV_XPATH_MEMIO 0 #endif +#ifndef EXV_USE_CURL +#define EXV_USE_CURL 0 +#endif + // ***************************************************************************** // included header files #include "types.hpp" @@ -47,6 +51,7 @@ #include // _O_BINARY in FileIo::FileIo #include // timestamp for the name of temporary file #include // std::memcpy + // ***************************************************************************** // namespace extensions namespace Exiv2 { @@ -1142,7 +1147,6 @@ namespace Exiv2 { //@} }; - #if EXV_USE_CURL == 1 /*! @brief Provides the http, https read/write access and ftp read access for the RemoteIo. diff --git a/include/exiv2/http.hpp b/include/exiv2/http.hpp index 2492ad4c..e4e5ad1d 100644 --- a/include/exiv2/http.hpp +++ b/include/exiv2/http.hpp @@ -13,7 +13,10 @@ namespace Exiv2 { } -#if EXV_USE_CURL +#ifndef EXV_USE_CURL +#define EXV_USE_CURL 0 +#endif +#if EXV_USE_CURL == 1 #include #endif