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

The following commit has been merged in the master branch:
commit e922a066be93a947f3c9696fe56776a96e5ffd55
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Oct 5 19:48:05 2016 +0000

    #1230 Fix cygwin buildbreaker.
---
 include/exiv2/config.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/exiv2/config.h b/include/exiv2/config.h
index eb045fe..a0c81bd 100644
--- a/include/exiv2/config.h
+++ b/include/exiv2/config.h
@@ -192,10 +192,8 @@ typedef int pid_t;
   you must -library=stdcxx4 along with these inclusions below
 */
 #if defined(OS_SOLARIS)
-# include <stdio.h>
 # include <string.h>
 # include <strings.h>
-# include <stdlib.h>
 # include <math.h>
 # if defined(__cplusplus)
 #  include <ios>
@@ -216,6 +214,16 @@ typedef int pid_t;
 #endif
 //////////////////////////////////////
 
+
+# include <stdio.h>
+#ifdef   EXV_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef __cplusplus
+#include <string>
+#include <iostream>
+#endif
+
 //
 // That's all Folks!
 #endif // _CONFIG_H_

-- 
exiv2 packaging