[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:45:58 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=d6dd463
The following commit has been merged in the master branch:
commit d6dd463c5796d570936d28034e14816483e7cfc7
Author: Robin Mills <robin at clanmills.com>
Date: Sun Nov 29 22:35:20 2015 +0000
#1041. Finally fixed stdint.h on all platforms. CMake builds exiv2 with VS 2005, 2008, 2010, 2012, 2013 and 2013 on both laptop and buildserver.
---
include/exiv2/types.hpp | 33 +++++++++++++++++----------------
xmpsdk/include/MD5.h | 3 ++-
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/include/exiv2/types.hpp b/include/exiv2/types.hpp
index e7009f3..00c225b 100644
--- a/include/exiv2/types.hpp
+++ b/include/exiv2/types.hpp
@@ -33,7 +33,6 @@
// included header files
#include "config.h"
-
#include "version.hpp"
// + standard includes
@@ -45,26 +44,28 @@
#include <sstream>
#ifdef _MSC_VER
-// Allow him to use Microsoft's stdint.h for 2015 and up
-# if _MSC_VER >= 1900
-# ifdef EXV_HAVE_STDINT_H
-# undef EXV_HAVE_STDINT_H
-# endif
+// Don't assume the value of EXV_HAVE_STDINT_H in exv_msvc.h has been set correctly
+# ifdef EXV_HAVE_STDINT_H
+# undef EXV_HAVE_STDINT_H
+# endif
+// Visual Studio 2010 and later has stdint.h
+# if _MSC_VER >= _MSC_VER_2010
+# include <stdint.h>
+# else
+// Earlier compilers have MS C99 equivalents such as __int8
+ typedef unsigned __int8 uint8_t;
+ typedef unsigned __int16 uint16_t;
+ typedef unsigned __int32 uint32_t;
+ typedef unsigned __int64 uint64_t;
+ typedef __int8 int8_t;
+ typedef __int16 int16_t;
+ typedef __int32 int32_t;
+ typedef __int64 int64_t;
# endif
#endif
#ifdef EXV_HAVE_STDINT_H
# include <stdint.h>
-#elif defined(_MSC_VER)
-// MSVC (before 2010) doesn't provide C99 types, but it has MS specific variants
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-typedef __int8 int8_t;
-typedef __int16 int16_t;
-typedef __int32 int32_t;
-typedef __int64 int64_t;
#endif
// MSVC macro to convert a string to a wide string
diff --git a/xmpsdk/include/MD5.h b/xmpsdk/include/MD5.h
index 994d02f..c0152bc 100644
--- a/xmpsdk/include/MD5.h
+++ b/xmpsdk/include/MD5.h
@@ -26,16 +26,17 @@
#include <sys/types.h>
#ifdef _MSC_VER
+// _MSC_VER 1600 == Visual Studio 2010
# if _MSC_VER < 1600
# ifdef EXV_HAVE_STDINT_H
# undef EXV_HAVE_STDINT_H
# endif
# endif
+#endif
#ifdef EXV_HAVE_STDINT_H
# include <stdint.h>
#endif
-#endif
/* MSVC doesn't provide C99 types, but it has MS specific variants */
#ifdef _MSC_VER
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list