From 4dd3d4effe6c76e97d2e0a915257570999b14574 Mon Sep 17 00:00:00 2001
From: John Emmas <john@creativepost.co.uk>
Date: Thu, 26 Mar 2020 10:40:36 +0000
Subject: Some initial changes (currently for libpbd only) to help a new
 contributer who's trying to build with MSVC2017

These changes compile okay for me (using VS2019) although they wouldn't link to my older-built libraries. Hopefully he'll be okay if he builds everything with the same compiler.
---
 msvc_extra_headers/ardourext/misc.h.input | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'msvc_extra_headers/ardourext/misc.h.input')

diff --git a/msvc_extra_headers/ardourext/misc.h.input b/msvc_extra_headers/ardourext/misc.h.input
index 4c8d193eac..6018886b58 100644
--- a/msvc_extra_headers/ardourext/misc.h.input
+++ b/msvc_extra_headers/ardourext/misc.h.input
@@ -19,9 +19,19 @@
 #ifndef __ardour_msvc_extensions_h__
 #define __ardour_msvc_extensions_h__
 
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
+#ifdef WINVER
+#undef WINVER
 #endif
+#if (defined(_MSC_VER) && (_MSC_VER < 1900)) /* 1900 is an arbitrary value, corresponding to VS2019 (it might need to be lowered) */
+#define WINVER 0x0500
+#else
+#define WINVER 0x0601
+#endif
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
+#define _WIN32_WINNT WINVER
+
 #ifndef _CPP_VECTOR
 #define _CPP_VECTOR  1
 #endif
@@ -208,8 +218,10 @@ inline int64_t abs(int64_t val) throw()
 #endif
 
 // fmin() and fmax()
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
 #define fmin(a, b) min((double)a, (double)b)
 #define fmax(a, b) max((double)a, (double)b)
+#endif
 
 // approximate POSIX pipe()
 #define pipe(handles) _pipe(handles, 4096, _O_BINARY)
-- 
cgit v1.2.3