[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=b7607c3

The following commit has been merged in the master branch:
commit b7607c34db674e3ebade5eea3f88a34474212f85
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Jan 3 12:36:20 2016 +0000

    #1047 Rollback r4163 and try again.  r4163 broke MSVC build.
---
 src/version.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/version.cpp b/src/version.cpp
index 3442e9c..1ba415c 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -99,8 +99,12 @@ EXIV2_RCSID("@(#) $Id$")
 #include <vector>
 #include <stdio.h>
 #include <iostream>
+
+// #1147
+#ifndef WIN32
 #include <unistd.h>
 #include <sys/types.h>
+#endif
 
 namespace Exiv2 {
     int versionNumber()
@@ -155,6 +159,7 @@ namespace Exiv2 {
 # include <mach-o/dyld.h>
 
 #elif defined(__linux__)
+# include <unistd.h>
 // http://syprog.blogspot.com/2011/12/listing-loaded-shared-objects-in-linux.html
 # include <dlfcn.h>
   struct something

-- 
exiv2 packaging