From: Ryan Volz <rvolz@mit.edu>
Date: Tue, 17 Apr 2018 14:23:32 +0000 (-0400)
Subject: Fix compile on Windows by avoiding min/max macros in windows.h.
X-Git-Tag: archive/raspbian/1.4-3+rpi1^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cc948d1a580094811fd7242e13d5c8389ae0f529;p=volk.git

Fix compile on Windows by avoiding min/max macros in windows.h.


Gbp-Pq: Name 0007-Fix-compile-on-Windows-by-avoiding-min-max-macros-in.patch
---

diff --git a/cmake/msvc/sys/time.h b/cmake/msvc/sys/time.h
index dca0fdf..aa0f5dc 100644
--- a/cmake/msvc/sys/time.h
+++ b/cmake/msvc/sys/time.h
@@ -5,6 +5,11 @@
 #ifndef _MSC_SYS_TIME_H_
 #define _MSC_SYS_TIME_H_
 
+// prevent windows.h from clobbering min and max functions with macros
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
 //http://social.msdn.microsoft.com/Forums/en/vcgeneral/thread/430449b3-f6dd-4e18-84de-eebd26a8d668
 #include < time.h >
 #include <windows.h> //I've omitted this line.