[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=5cf87e1

The following commit has been merged in the master branch:
commit 5cf87e19dd874fd5b4cc6156a533af65b84ebe40
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Sep 6 23:11:10 2016 +0000

    #1074 Correction to r4466 to fix MinGW build breaker on include <sys/select.h>
---
 src/exiv2app.hpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/exiv2app.hpp b/src/exiv2app.hpp
index 25dc749..a0e7bdc 100644
--- a/src/exiv2app.hpp
+++ b/src/exiv2app.hpp
@@ -31,6 +31,8 @@
 
 // *****************************************************************************
 // included header files
+#include <exiv2/exiv2.hpp>
+
 #include "utils.hpp"
 #include "types.hpp"
 
@@ -53,9 +55,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/select.h>
 #if defined(__CYGWIN__) || defined(__MINGW__)
 #include <windows.h>
+#else
+#include <sys/select.h>
 #endif
 #endif
 
@@ -354,8 +357,8 @@ public:
     {
         // copy stdin to stdinBuf
         if ( stdinBuf.size_ == 0 ) {
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__) || defined(_MSC_VER) 
-            DWORD fdwMode; 
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__) || defined(_MSC_VER)
+            DWORD fdwMode;
             _setmode(_fileno(stdin), O_BINARY);
             if ( !GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &fdwMode) ) { // failed: stdin has bytes!
 #else

-- 
exiv2 packaging