From bd5b3337876078f8af8eb5df6af6de9cdc3184dd Mon Sep 17 00:00:00 2001
From: Henric Jungheim <software@henric.org>
Date: Sat, 10 Jun 2017 02:53:02 -0700
Subject: [PATCH] libnyquist: Update for VS2015+

---
 lib-src/libnyquist/nyquist/nyqsrc/sound.c          | 2 +-
 lib-src/libnyquist/nyquist/nyqsrc/sound.h          | 4 ----
 lib-src/libnyquist/nyquist/sys/win/msvc/switches.h | 2 ++
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib-src/libnyquist/nyquist/nyqsrc/sound.c b/lib-src/libnyquist/nyquist/nyqsrc/sound.c
index a573288a8..1dab5898b 100644
--- a/lib-src/libnyquist/nyquist/nyqsrc/sound.c
+++ b/lib-src/libnyquist/nyquist/nyqsrc/sound.c
@@ -1591,7 +1591,7 @@ double step_to_hz(double steps)
 }
 
 #ifdef WIN32
-#ifndef _MSC_VER < 1800
+#if _MSC_VER < 1800
 #define RECIP_LOG_2 1.44269504088895364453
 
 double log2(double x)
diff --git a/lib-src/libnyquist/nyquist/nyqsrc/sound.h b/lib-src/libnyquist/nyquist/nyqsrc/sound.h
index 86a99f7cd..9e0fa6477 100644
--- a/lib-src/libnyquist/nyquist/nyqsrc/sound.h
+++ b/lib-src/libnyquist/nyquist/nyqsrc/sound.h
@@ -464,10 +464,6 @@ sound_type sound_zero(time_type t0, rate_type sr);
 double step_to_hz(double);
     /* LISP: (STEP-TO-HZ ANYNUM) */
 
-#ifdef WIN32
-double log2(double x);
-#endif /* WIN32 */
-
 /* macros for access to samples within a suspension */
 /* NOTE: assume suspension structure is named "susp" */
 
diff --git a/lib-src/libnyquist/nyquist/sys/win/msvc/switches.h b/lib-src/libnyquist/nyquist/sys/win/msvc/switches.h
index 94e5beef9..a51e60345 100644
--- a/lib-src/libnyquist/nyquist/sys/win/msvc/switches.h
+++ b/lib-src/libnyquist/nyquist/sys/win/msvc/switches.h
@@ -87,7 +87,9 @@ void nyquist_printf(char *format, ...);
 #define HAVE_LRINTF 0
 
 /* Define to 1 if you have the `snprintf' function. */
+#if _MSC_VER < 1900
 #define snprintf _snprintf
+#endif
 #define HAVE_SNPRINTF 1
 
 /* Define to 1 if the system has the type `ssize_t'. */