[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=108310b

The following commit has been merged in the master branch:
commit 108310bfb47f01dcf8dd8e8d06a19fcfbead84ab
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Jun 15 15:09:30 2015 +0000

    Prefix published precompiler define as usual.
---
 include/exiv2/basicio.hpp | 9 +++++----
 src/basicio.cpp           | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/exiv2/basicio.hpp b/include/exiv2/basicio.hpp
index 2f90a91..55ff097 100644
--- a/include/exiv2/basicio.hpp
+++ b/include/exiv2/basicio.hpp
@@ -29,9 +29,10 @@
 #ifndef BASICIO_HPP_
 #define BASICIO_HPP_
 
-// The way to handle data from stdin or data uri path. If XPATH_MEMIO = 1, it uses MemIo. Otherwises, it uses FileIo.
-#ifndef XPATH_MEMIO
-#define XPATH_MEMIO 0
+// The way to handle data from stdin or data uri path. If EXV_XPATH_MEMIO = 1,
+// it uses MemIo. Otherwises, it uses FileIo.
+#ifndef EXV_XPATH_MEMIO
+#define EXV_XPATH_MEMIO 0
 #endif
 
 // *****************************************************************************
@@ -760,7 +761,7 @@ namespace Exiv2 {
     /*!
       @brief Provides binary IO for the data from stdin and data uri path.
      */
-#if XPATH_MEMIO
+#if EXV_XPATH_MEMIO
     class EXIV2API XPathIo : public MemIo {
     public:
         //! @name Creators
diff --git a/src/basicio.cpp b/src/basicio.cpp
index a829690..2db9868 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -1380,7 +1380,7 @@ namespace Exiv2 {
 
     }
 
-#if XPATH_MEMIO
+#if EXV_XPATH_MEMIO
     XPathIo::XPathIo(const std::string& path) {
         Protocol prot = fileProtocol(path);
 

-- 
exiv2 packaging