[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:46:32 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=80e2a47
The following commit has been merged in the master branch:
commit 80e2a47240fcb763258ace6f8e371d38897d7eaf
Author: Robin Mills <robin at clanmills.com>
Date: Thu Jun 23 20:39:24 2016 +0000
Corrections to r4338
---
config/config.h.in | 87 +--------------------------------------
include/exiv2/config.h | 109 +++++++++++++++++++++++++++++--------------------
2 files changed, 65 insertions(+), 131 deletions(-)
diff --git a/config/config.h.in b/config/config.h.in
index 2a96ec7..151b832 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -1,10 +1,7 @@
+#pragma once
#ifndef __CONFIG__H__
#define __CONFIG__H__
-#ifdef _MSC_VER
-# include "exv_msvc.h"
-#else
-
/* Define to 1 if you want to use libssh */
#undef USE_SSH
@@ -203,86 +200,4 @@
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
-#if defined __CYGWIN32__ && !defined __CYGWIN__
- /* For backwards compatibility with Cygwin b19 and
- earlier, we define __CYGWIN__ here, so that
- we can rely on checking just for that macro. */
-#define __CYGWIN__ __CYGWIN32__
-#endif
-
-#if defined __MINGW32__ || defined __MINGW64__
-#ifndef __MINGW__
-#define __MINGW__ 1
-#endif
-#endif
-
-/* File path separator */
-#if defined WIN32 && !defined __CYGWIN__
-#define SEPARATOR_STR "\"
-#define SEPARATOR_CHR '\'
-#else
-#define SEPARATOR_STR "/"
-#define SEPARATOR_CHR '/'
-#endif
-
-/* Symbol visibility support */
-#ifdef WIN32
-# define EXV_IMPORT __declspec(dllimport)
-# define EXV_EXPORT __declspec(dllexport)
-# define EXV_DLLLOCAL
-# define EXV_DLLPUBLIC
-#else
-# ifdef EXV_WANT_VISIBILITY_SUPPORT
-# if defined(__GNUC__) && (__GNUC__ >= 4)
-# define EXV_IMPORT __attribute__ ((visibility("default")))
-# define EXV_EXPORT __attribute__ ((visibility("default")))
-# define EXV_DLLLOCAL __attribute__ ((visibility("hidden")))
-# define EXV_DLLPUBLIC __attribute__ ((visibility("default")))
-# elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-# define EXV_IMPORT __global
-# define EXV_EXPORT __global
-# define EXV_DLLLOCAL __hidden
-# define EXV_DLLPUBLIC __global
-# else
-# define EXV_IMPORT
-# define EXV_EXPORT
-# define EXV_DLLLOCAL
-# define EXV_DLLPUBLIC
-# endif
-# else /* ! EXV_WANT_VISIBILITY_SUPPORT */
-# define EXV_IMPORT
-# define EXV_EXPORT
-# define EXV_DLLLOCAL
-# define EXV_DLLPUBLIC
-# endif /* ! EXV_WANT_VISIBILITY_SUPPORT */
-#endif /* ! WIN32 */
-
-/* Define EXIV2API for DLL builds */
-#ifdef EXV_HAVE_DLL
-# ifdef EXV_BUILDING_LIB
-# define EXIV2API EXV_EXPORT
-# else
-# define EXIV2API EXV_IMPORT
-# endif /* ! EXV_BUILDING_LIB */
-#else
-# define EXIV2API
-#endif /* ! EXV_HAVE_DLL */
-
-/*
- If you're using Solaris and the Solaris Studio compiler, then you really
- do need to use -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>
-#include <fstream>
-#endif
-#endif
-
-#endif
#endif
diff --git a/include/exiv2/config.h b/include/exiv2/config.h
index 8f4dd35..26eb483 100644
--- a/include/exiv2/config.h
+++ b/include/exiv2/config.h
@@ -30,19 +30,19 @@
#define MSDEV_2003 1
#endif
-// Constants required by Microsoft SDKs to define SHGetFolderPathA and others
-#ifndef _WIN32_WINNT
-// Visual Studio 2012 and earlier
-# if _MSC_VER < 1800
-# define _WIN32_WINNT 0x0501
-# else
-# define _WIN32_WINNT 0x0600
-# endif
-#endif
-
-#include <windows.h>
-#include <shlobj.h>
+// Constants required by Microsoft SDKs to define SHGetFolderPathA and others
+#ifndef _WIN32_WINNT
+// Visual Studio 2012 and earlier
+# if _MSC_VER < 1800
+# define _WIN32_WINNT 0x0501
+# else
+# define _WIN32_WINNT 0x0600
+# endif
+#endif
+
+#include <windows.h>
+#include <shlobj.h>
#pragma comment(lib, "ws2_32.lib")
#pragma comment(lib, "wldap32.lib")
@@ -74,31 +74,6 @@
typedef int pid_t;
#endif
-/* Shared library support */
-#ifdef EXV_HAVE_DLL
-#define EXV_IMPORT __declspec(dllimport)
-#define EXV_EXPORT __declspec(dllexport)
-#define EXV_DLLLOCAL
-#define EXV_DLLPUBLIC
-#else
-#define EXV_IMPORT
-#define EXV_EXPORT
-#define EXV_DLLLOCAL
-#define EXV_DLLPUBLIC
-#define EXIV2API
-#endif
-
-/* Define EXIV2API for DLL builds */
-#ifdef EXV_HAVE_DLL
-# ifdef EXV_BUILDING_LIB
-# define EXIV2API EXV_EXPORT
-# else
-# define EXIV2API EXV_IMPORT
-# endif /* ! EXV_BUILDING_LIB */
-#else
-# define EXIV2API
-#endif /* ! EXV_HAVE_DLL */
-
/* Help out our buddy curl */
#if !defined(EXV_HAVE_DLL)
# define CURL_STATICLIB
@@ -119,6 +94,58 @@ typedef int pid_t;
#endif
////////////////////////////////////////
+///// End symbol visibility /////////
+#if defined(__CYGWIN32__) && !defined(__CYGWIN__)
+ /* For backwards compatibility with Cygwin b19 and
+ earlier, we define __CYGWIN__ here, so that
+ we can rely on checking just for that macro. */
+# define __CYGWIN__ __CYGWIN32__
+# define EXV_HAVE_GXXCLASSVISIBILITY
+#endif
+#ifdef WIN32
+# define EXV_IMPORT __declspec(dllimport)
+# define EXV_EXPORT __declspec(dllexport)
+# define EXV_DLLLOCAL
+# define EXV_DLLPUBLIC
+#else
+# ifdef EXV_WANT_VISIBILITY_SUPPORT
+# if defined(__GNUC__) && (__GNUC__ >= 4)
+# define EXV_IMPORT __attribute__ ((visibility("default")))
+# define EXV_EXPORT __attribute__ ((visibility("default")))
+# define EXV_DLLLOCAL __attribute__ ((visibility("hidden")))
+# define EXV_DLLPUBLIC __attribute__ ((visibility("default")))
+# elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+# define EXV_IMPORT __global
+# define EXV_EXPORT __global
+# define EXV_DLLLOCAL __hidden
+# define EXV_DLLPUBLIC __global
+# else
+# define EXV_IMPORT
+# define EXV_EXPORT
+# define EXV_DLLLOCAL
+# define EXV_DLLPUBLIC
+# endif
+# else /* ! EXV_WANT_VISIBILITY_SUPPORT */
+# define EXV_IMPORT
+# define EXV_EXPORT
+# define EXV_DLLLOCAL
+# define EXV_DLLPUBLIC
+# endif /* ! EXV_WANT_VISIBILITY_SUPPORT */
+#endif /* ! WIN32 */
+
+/* Define EXIV2API for DLL builds */
+#ifdef EXV_HAVE_DLL
+# ifdef EXV_BUILDING_LIB
+# define EXIV2API EXV_EXPORT
+# else
+# define EXIV2API EXV_IMPORT
+# endif /* ! EXV_BUILDING_LIB */
+#else
+# define EXIV2API
+#endif /* ! EXV_HAVE_DLL */
+
+///// End symbol visibility /////////
+
///// Start of platform marcos /////////
// Linux GCC 4.8 appears to be confused about strerror_r
#ifndef EXV_STRERROR_R_CHAR_P
@@ -157,14 +184,6 @@ typedef int pid_t;
# endif
#endif
-#if defined(__CYGWIN32__) && !defined(__CYGWIN__)
- /* For backwards compatibility with Cygwin b19 and
- earlier, we define __CYGWIN__ here, so that
- we can rely on checking just for that macro. */
-# define __CYGWIN__ __CYGWIN32__
-# define EXV_HAVE_GXXCLASSVISIBILITY
-#endif
-
/*
If you're using Solaris and the Solaris Studio compiler
you must -library=stdcxx4 along with these inclusions below
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list