#1187 and #1041 Fixing CMake/MSVC build breaker

config/config.h.cmake

@@ -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

include/exiv2/exv_msvc.h

@@ -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

include/exiv2/rwlock.hpp

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