From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:37 +0000 (-0700)
Subject: Changes to common header files; not applicable to open-vm-tools.
X-Git-Tag: stable-10.2.0~234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=699f7e7403fa3010a382d804806a9c5b50a38239;p=thirdparty%2Fopen-vm-tools.git

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 6562828c6..f021aac1f 100644
--- 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 0cccd5d8c..87387a83e 100644
--- 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;