From 5b3eea25fb7137beecd98217ba80b8d99ba0357d Mon Sep 17 00:00:00 2001
From: Ian Curtis <i.curtis@gmail.com>
Date: Tue, 22 Mar 2016 11:34:32 +0000
Subject: [PATCH] fix basic compile errors (with vs)

---
 Src/Model3/DriveBoard.cpp | 5 +++--
 Src/OSD/SDL/Audio.cpp     | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Src/Model3/DriveBoard.cpp b/Src/Model3/DriveBoard.cpp
index f4ac7f2..d293169 100644
--- a/Src/Model3/DriveBoard.cpp
+++ b/Src/Model3/DriveBoard.cpp
@@ -32,6 +32,7 @@
 
 #include <cstdio>
 #include <cmath>
+#include <algorithm>
 
 #define RAM_SIZE 0x2000	// Z80 RAM
 
@@ -456,13 +457,13 @@ void CDriveBoard::EmulateFrame(void)
 {
 	// Assuming Z80 runs @ 4.0MHz and NMI triggers @ 60.0KHz
 	// TODO - find out if Z80 frequency is correct and exact frequency of NMI interrupts (just guesswork at the moment!)
-	int cycles     = 4.0 * 1000000 / 60;
+	int cycles     = (int)(4.0 * 1000000 / 60);
 	int loopCycles = 10000;
 	while (cycles > 0)
 	{
 		if (m_allowInterrupts)
 			m_z80.TriggerNMI();
-		cycles -= m_z80.Run(min<int>(loopCycles, cycles));
+		cycles -= m_z80.Run(std::min<int>(loopCycles, cycles));
 	}
 }
 
diff --git a/Src/OSD/SDL/Audio.cpp b/Src/OSD/SDL/Audio.cpp
index f134521..6924227 100755
--- a/Src/OSD/SDL/Audio.cpp
+++ b/Src/OSD/SDL/Audio.cpp
@@ -36,6 +36,7 @@
 #endif
 
 #include <cmath>
+#include <algorithm>
 
 // Model3 audio output is 44.1KHz 2-channel sound and frame rate is 60fps
 #define SAMPLE_RATE 44100
@@ -256,7 +257,7 @@ bool OpenAudio()
 	// Create audio buffer
 	audioBufferSize = SAMPLE_RATE * BYTES_PER_SAMPLE * latency / MAX_LATENCY;
 	int minBufferSize = 3 * BYTES_PER_FRAME;
-	audioBufferSize = max<int>(minBufferSize, audioBufferSize);
+	audioBufferSize = std::max<int>(minBufferSize, audioBufferSize);
 	audioBuffer = new(std::nothrow) INT8[audioBufferSize];
 	if (audioBuffer == NULL)
 	{