From 58cb123ab2cc2f5bbf64ecae9666c015c058b302 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Thu, 8 Jan 2015 14:59:25 +0000 Subject: [PATCH] #1016. Thank You Thomas for reporting this issue. --- msvc2003/include/exv_msvc.h | 139 ------------------------------------ msvc2005/include/exv_msvc.h | 133 ---------------------------------- 2 files changed, 272 deletions(-) delete mode 100644 msvc2003/include/exv_msvc.h delete mode 100644 msvc2005/include/exv_msvc.h diff --git a/msvc2003/include/exv_msvc.h b/msvc2003/include/exv_msvc.h deleted file mode 100644 index 4ac65b19..00000000 --- a/msvc2003/include/exv_msvc.h +++ /dev/null @@ -1,139 +0,0 @@ -/* ***************************************************************** -*- C -*- */ -/*! - @file exv_msvc.h - @brief Configuration settings for MSVC - @version $Rev$ - @author Andreas Huggel (ahu) - ahuggel@gmx.net - @date 07-Feb-04, ahu: created - 26-Feb-05, ahu: renamed and moved to src directory - */ - -/* Todo: The PACKAGE_* defines should be generated */ - -#ifdef _MSC_VER - -#if _MSC_VER >= 1600 -// stdint.h was introduced with DevStudio 2010 -#define EXV_HAVE_STDINT_H 1 -#endif -#if _MSC_VER >= 1700 -#define MSDEV_2012 1 -#elif _MSC_VER >= 1600 -#define MSDEV_2010 1 -#elif _MSC_VER >= 1500 -#define MSDEV_2008 1 -#elif _MSC_VER >= 1400 -#define MSDEV_2005 1 -#else -#define MSDEV_2003 1 -#endif - -/* Define to 1 if you have the header file. */ -#define EXV_HAVE_PROCESS_H 1 - -/* Define to the address where bug reports for this package should be sent. */ -#define EXV_PACKAGE_BUGREPORT "ahuggel@gmx.net" - -/* Define to the full name of this package. */ -#define EXV_PACKAGE_NAME "exiv2" - -/* Define to the full name and version of this package. */ -#define EXV_PACKAGE_STRING "exiv2 0.24" - -/* Define to the one symbol short name of this package. */ -#define EXV_PACKAGE_TARNAME "exiv2" - -/* Define to the version of this package. */ -#define EXV_PACKAGE_VERSION "0.24" - -/* Define to `int' if does not define pid_t. */ -typedef int pid_t; - -#ifndef EXV_COMMERCIAL_VERSION - -/* Define to 1 to enable translation of Nikon lens names. */ -# define EXV_HAVE_LENSDATA 1 - -/* Define to 1 if translation of program messages to the user's - native language is requested. */ -# undef EXV_ENABLE_NLS - -#endif /* !EXV_COMMERCIAL_VERSION */ - -/* Define to 1 if you have the `iconv' function. */ -# undef EXV_HAVE_ICONV - -#ifdef EXV_HAVE_ICONV -#define EXV_ICONV_CONST const -#endif - -/* Define as 1 if you have the `zlib' library. (0 to omit zlib) [png support] */ -#define HAVE_LIBZ 1 - -#if HAVE_LIBZ - #define EXV_HAVE_LIBZ - // assist VC7.1 to compile vsnprintf - #if (_MSC_VER < 1400) && !defined(vsnprintf) - #define vsnprintf _vsnprintf - #endif -#endif - -/* Define to 1 if you have the Adobe XMP Toolkit. */ -#define EXV_HAVE_XMP_TOOLKIT 1 - -/* File path seperator */ -#define EXV_SEPERATOR_STR "\\" -#define EXV_SEPERATOR_CHR '\\' - -/* Windows unicode path support */ -#define EXV_UNICODE_PATH - -/* Define to 1 if you have the `mmap' function. */ -/* #undef EXV_HAVE_MMAP */ - -/* Define to 1 if you have the `munmap' function. */ -/* #undef EXV_HAVE_MUNMAP */ - -/* 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 */ - - -/* - Disable warning 4251. This is warning from std templates about exporting interfaces -*/ -#ifdef EXV_HAVE_DLL -#pragma warning( disable : 4251 ) -#endif -/* - Visual Studio C++ 2005 (8.0) - Disable warnings about 'deprecated' standard functions - See, eg. http://www.informit.com/guides/content.asp?g=cplusplus&seqNum=259 -*/ -#if _MSC_VER >= 1400 -# pragma warning(disable : 4996) -#endif - -#endif /* _MSC_VER */ diff --git a/msvc2005/include/exv_msvc.h b/msvc2005/include/exv_msvc.h deleted file mode 100644 index b34db161..00000000 --- a/msvc2005/include/exv_msvc.h +++ /dev/null @@ -1,133 +0,0 @@ -/* ***************************************************************** -*- C -*- */ -/*! - @file exv_msvc.h - @brief Configuration settings for MSVC - @version $Rev: 2320 $ - @author Andreas Huggel (ahu) - ahuggel@gmx.net - @date 07-Feb-04, ahu: created - 26-Feb-05, ahu: renamed and moved to src directory - */ - -/* Todo: The PACKAGE_* defines should be generated */ - -#ifdef _MSC_VER - -// http://msdn.microsoft.com/en-us/library/ms235458.aspx -#if _MSC_VER >= 1700 -#define chmod _chmod -#endif - -#if _MSC_VER >= 1600 -// stdint.h was introduced with DevStudio 2010 -#define EXV_HAVE_STDINT_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define EXV_HAVE_PROCESS_H 1 - -/* Define to the address where bug reports for this package should be sent. */ -#define EXV_PACKAGE_BUGREPORT "ahuggel@gmx.net" - -/* Define to the full name of this package. */ -#define EXV_PACKAGE_NAME "exiv2" - -/* Define to the full name and version of this package. */ -#define EXV_PACKAGE_STRING "exiv2 0.24" - -/* Define to the one symbol short name of this package. */ -#define EXV_PACKAGE_TARNAME "exiv2" - -/* Define to the version of this package. */ -#define EXV_PACKAGE_VERSION "0.24" - -/* Define to `int' if does not define pid_t. */ -typedef int pid_t; - -#ifndef EXV_COMMERCIAL_VERSION - -/* Define to 1 to enable translation of Nikon lens names. */ -# define EXV_HAVE_LENSDATA 1 - -/* Define to 1 if translation of program messages to the user's - native language is requested. */ -# undef EXV_ENABLE_NLS - -#endif /* !EXV_COMMERCIAL_VERSION */ - -/* Define to 1 if you have the `iconv' function. */ -# undef EXV_HAVE_ICONV - -#ifdef EXV_HAVE_ICONV -#define EXV_ICONV_CONST const -#endif - -/* Define as 1 if you have the `zlib' library. (0 to omit zlib) [png support] */ -#define HAVE_LIBZ 1 - -#if HAVE_LIBZ - #define EXV_HAVE_LIBZ - // assist VC7.1 to compile vsnprintf - #if (_MSC_VER < 1400) && !defined(vsnprintf) - #define vsnprintf _vsnprintf - #endif -#endif - -/* Define to 1 if you have the Adobe XMP Toolkit. */ -#define EXV_HAVE_XMP_TOOLKIT 1 - -/* File path seperator */ -#define EXV_SEPERATOR_STR "\\" -#define EXV_SEPERATOR_CHR '\\' - -/* Windows unicode path support */ -#define EXV_UNICODE_PATH - -/* Define to 1 if you have the `mmap' function. */ -/* #undef EXV_HAVE_MMAP */ - -/* Define to 1 if you have the `munmap' function. */ -/* #undef EXV_HAVE_MUNMAP */ - -/* 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 */ - - -/* - Disable warning 4251. This is warning from std templates about exporting interfaces -*/ -#ifdef EXV_HAVE_DLL -#pragma warning( disable : 4251 ) -#endif -/* - Visual Studio C++ 2005 (8.0) - Disable warnings about 'deprecated' standard functions - See, eg. http://www.informit.com/guides/content.asp?g=cplusplus&seqNum=259 -*/ -#if _MSC_VER >= 1400 -# pragma warning(disable : 4996) -#endif - -#endif /* _MSC_VER */