[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:46:31 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=2f8e56f
The following commit has been merged in the master branch:
commit 2f8e56fd70a47e224a7c6494d1e183ba8cfc71fe
Author: Robin Mills <robin at clanmills.com>
Date: Tue Jun 14 13:42:44 2016 +0000
Correction to r4327
---
config/config.h.cmake | 2 ++
include/exiv2/exv_msvc.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/config/config.h.cmake b/config/config.h.cmake
index 22a302c..18a93a6 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -268,6 +268,7 @@ typedef int pid_t;
#endif
/* File path separator */
+#ifndef EXV_SEPARATOR_STR
#if defined(WIN32) && !defined(__CYGWIN__)
#define EXV_SEPARATOR_STR "\"
#define EXV_SEPARATOR_CHR '\'
@@ -275,6 +276,7 @@ typedef int pid_t;
#define EXV_SEPARATOR_STR "/"
#define EXV_SEPARATOR_CHR '/'
#endif
+#endif
/* Shared library support, see http://gcc.gnu.org/wiki/Visibility */
#if defined(WIN32) && !defined(__CYGWIN__) && EXV_HAVE_DLL
diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index 2ce5e1c..f3e4074 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -268,6 +268,7 @@ typedef int pid_t;
#endif
/* File path separator */
+#ifndef EXV_SEPARATOR_STR
#if defined(WIN32) && !defined(__CYGWIN__)
#define EXV_SEPARATOR_STR "\"
#define EXV_SEPARATOR_CHR '\'
@@ -275,6 +276,7 @@ typedef int pid_t;
#define EXV_SEPARATOR_STR "/"
#define EXV_SEPARATOR_CHR '/'
#endif
+#endif
/* Shared library support, see http://gcc.gnu.org/wiki/Visibility */
#if defined(WIN32) && !defined(__CYGWIN__) && EXV_HAVE_DLL
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list