blob: 777e2124fd8a2fb6e467ddf7e30fb1fb5558c73a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
|
--- src/hardware/ide.cpp.origin 2015-06-16 02:04:57.201788266 +0200
+++ src/hardware/ide.cpp 2015-06-16 02:07:09.294635540 +0200
@@ -22,11 +22,14 @@
#include "bios_disk.h"
#include "../src/dos/cdrom.h"
+/*
#ifdef _MSC_VER
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#else
# define MIN(a,b) std::min(a,b)
#endif
+*/
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX_IDE_CONTROLLERS 8
|