third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1187 and #1041 Fixing CMake/MSVC build breaker

Browse Source
This commit is contained in:
Robin Mills 2016-06-04 05:56:02 +00:00
parent e155be6372
commit 0afe5a97a1
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/config.h.cmake
View File

@ -37,7 +37,6 @@
#define HAVE_NTOHLL 1
#endif
/* Define to 1 if you want to use `libssh' for SshIO. */
#cmakedefine EXV_USE_SSH 1
@ -324,6 +323,15 @@ typedef int pid_t;
# pragma warning(disable : 4996)
#endif
// Constants required by Microsoft SDKs to define SHGetFolderPathA and others
#ifdef _MSC_VER
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
# endif
# include <windows.h>
# include <shlobj.h>
#endif
/*
If you're using Solaris and the Solaris Studio compiler
you must -library=stdcxx4 along with these inclusions below

9
include/exiv2/exv_msvc.h
View File

@ -323,6 +323,15 @@ typedef int pid_t;
# pragma warning(disable : 4996)
#endif
// Constants required by Microsoft SDKs to define SHGetFolderPathA and others
#ifdef _MSC_VER
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0400
# endif
# include <windows.h>
# include <shlobj.h>
#endif
/*
If you're using Solaris and the Solaris Studio compiler
you must -library=stdcxx4 along with these inclusions below

9
include/exiv2/rwlock.hpp
View File

@ -22,13 +22,8 @@
#ifndef RW_LOCK_HPP
#define RW_LOCK_HPP
#ifdef _MSC_VER
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0400
# endif
# include <windows.h>
#else
# include <pthread.h>
#ifndef _MSC_VER
#include <pthread.h>
#endif
namespace Exiv2 {