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

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

    #1147 Fixed travis build-breaker.
---
 src/version.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/version.cpp b/src/version.cpp
index 192b7b0..3442e9c 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -67,7 +67,6 @@ EXIV2_RCSID("@(#) $Id$")
 #define  EXV_SYS_TYPES 0
 #endif
 
-
 #ifndef  EXV_HAVE_UNISTD
 #define  EXV_HAVE_UNISTD 0
 #endif
@@ -100,7 +99,8 @@ EXIV2_RCSID("@(#) $Id$")
 #include <vector>
 #include <stdio.h>
 #include <iostream>
-
+#include <unistd.h>
+#include <sys/types.h>
 
 namespace Exiv2 {
     int versionNumber()
@@ -155,7 +155,6 @@ 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