[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=4e96e27

The following commit has been merged in the master branch:
commit 4e96e2742a100685b1a233d5f30ccc2b6288358b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jun 17 14:33:29 2015 +0000

    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 55ff097..6a8fbf2 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 <fcntl.h>      // _O_BINARY in FileIo::FileIo
 #include <ctime>        // timestamp for the name of temporary file
 #include <cstring>      // 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 2492ad4..e4e5ad1 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 <curl/curl.h>
 #endif
 

-- 
exiv2 packaging