[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=4795a13

The following commit has been merged in the master branch:
commit 4795a1309abec2cae8408f94e5a9f33d005420c3
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Sep 23 22:41:18 2015 +0000

    Correction to r3960 for Visual Studio
---
 include/exiv2/exv_msvc.h | 32 ++++++++++++++++++++------------
 src/localtime.c          |  3 +++
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index b29f81e..2e08211 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -12,27 +12,35 @@
 #ifndef _EXV_MSVC_H_
 #define _EXV_MSVC_H_
 
-#if _MSC_VER >= 1600
-// stdint.h was introduced with DevStudio 2010
-#define EXV_HAVE_STDINT_H 1
-#endif
-#if    _MSC_VER >= 1900
-#define MSDEV_2014    1
-#elif  _MSC_VER >= 1800
+#define _MSC_VER_2015 1900
+#define _MSC_VER_2013 1800
+#define _MSC_VER_2012 1700
+#define _MSC_VER_2010 1600
+#define _MSC_VER_2008 1500
+#define _MSC_VER_2005 1400
+#define _MSC_VER_2003 1300
+
+#if    _MSC_VER >= _MSC_VER_2015
+#define MSDEV_2015    1
+#elif  _MSC_VER >= _MSC_VER_2013
 #define MSDEV_2013    1
-#elif  _MSC_VER >= 1700
+#elif  _MSC_VER >= _MSC_VER_2012
 #define MSDEV_2012    1
-#elif  _MSC_VER >= 1600
+#elif  _MSC_VER >= _MSC_VER_2010
 #define MSDEV_2010    1
-#elif  _MSC_VER >= 1500
+#elif  _MSC_VER >= _MSC_VER_2008
 #define MSDEV_2008    1
-#elif  _MSC_VER >= 1400
+#elif  _MSC_VER >= _MSC_VER_2005
 #define MSDEV_2005    1
 #else
 #define MSDEV_2003    1
 #endif
 
-#if MSDEV_2012
+#if _MSC_VER >= _MSC_VER_2010
+#define EXV_HAVE_STDINT_H 1
+#endif
+
+#if _MSC_VER_ == _MSC_VER_2012
 #define HAVE_NTOHLL 1
 #endif
 
diff --git a/src/localtime.c b/src/localtime.c
index 9e188cd..24a9980 100644
--- a/src/localtime.c
+++ b/src/localtime.c
@@ -3,9 +3,12 @@
   @brief   This file is from the tz distribution at ftp://elsie.nci.nih.gov/pub/
   @version $Rev$
 */
+
 #ifdef  _MSC_VER
+#if     _MSC_VER > _MSC_VER_2015
 #define tzname _tzname
 #endif
+#endif
 
 #include "config.h"
 #include "timegm.h"

-- 
exiv2 packaging