Changes to common header files; not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/bsdfmt.h b/open-vm-tools/lib/include/bsdfmt.h
index 6562828c68c0c76715400a2f2cea10ad53599fc3..f021aac1f29bdac841f93c6916aad6274d9431af 100644 (file)
--- a/open-vm-tools/lib/include/bsdfmt.h
+++ b/open-vm-tools/lib/include/bsdfmt.h
@@ -126,7 +126,7 @@ char *BSDFmt_UJToA(uintmax_t, char *, int, int, const char *, int, char,
  * in VS2003/VC7/include/wchar.h -- edward
  */
 
-#ifdef _WIN32
+#if defined(_WIN32) && _MSC_VER < 1900
 #define mbstate_t int
 #endif
 

diff --git a/open-vm-tools/lib/include/timeutil.h b/open-vm-tools/lib/include/timeutil.h
index 0cccd5d8c1acaee5adac9d4b7f8af5c2b9037eda..87387a83ee6fc36bd142a1865938551c6387d463 100644 (file)
--- a/open-vm-tools/lib/include/timeutil.h
+++ b/open-vm-tools/lib/include/timeutil.h
@@ -45,7 +45,7 @@ extern "C" {
 struct timeval;
 
 /*struct timespec is not supported on UWP*/
-#if defined(_WIN32) && !defined(VM_WIN_UWP)
+#if defined(_WIN32) && !defined(VM_WIN_UWP) && _MSC_VER < 1900
 struct timespec {
    time_t tv_sec;
    long   tv_nsec;