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

The following commit has been merged in the master branch:
commit 4529537598d864d737ac176509c1ff07bb5d5540
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Mar 25 10:18:44 2016 +0000

    #1034. Corrections to r4249 to fix build-breakers
---
 src/makernote.cpp | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index 86e237e..cbc0729 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -42,10 +42,36 @@ EXIV2_RCSID("@(#) $Id$")
 #include <string>
 #include <cstring>
 
-#ifndef _MSC_VER
-#include <unistd.h>
-#include <sys/types.h>
-#include <pwd.h>
+#ifdef _MSC_VER
+# include <windows.h>
+# include <shlobj.h>
+  /* older SDKs not have these */
+# ifndef CSIDL_MYMUSIC
+#    define CSIDL_MYMUSIC 13
+# endif
+# ifndef CSIDL_MYVIDEO
+#    define CSIDL_MYVIDEO 14
+# endif
+# ifndef CSIDL_INTERNET_CACHE
+#    define CSIDL_INTERNET_CACHE 32
+# endif
+# ifndef CSIDL_COMMON_APPDATA
+#    define CSIDL_COMMON_APPDATA 35
+# endif
+# ifndef CSIDL_MYPICTURES
+#    define CSIDL_MYPICTURES 0x27
+# endif
+# ifndef CSIDL_COMMON_DOCUMENTS
+#    define CSIDL_COMMON_DOCUMENTS 46
+# endif
+# ifndef CSIDL_PROFILE
+#    define CSIDL_PROFILE 40
+# endif
+# include <process.h>
+#else
+# include <unistd.h>
+# include <sys/types.h>
+# include <pwd.h>
 #endif
 
 // *****************************************************************************

-- 
exiv2 packaging