diff options
| author | brainpower | 2015-06-16 23:20:37 +0200 |
|---|---|---|
| committer | brainpower | 2015-06-16 23:20:37 +0200 |
| commit | f21de6dad42954a5ebd062666259a00b701e33e0 (patch) | |
| tree | 24a825ac6d3ebf677e23cb0555af363a99ddd4c3 /0005-fix-MIN.patch | |
| download | aur-f21de6dad42954a5ebd062666259a00b701e33e0.tar.gz | |
create dosbox-daum with version 20150103
Diffstat (limited to '0005-fix-MIN.patch')
| -rw-r--r-- | 0005-fix-MIN.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/0005-fix-MIN.patch b/0005-fix-MIN.patch new file mode 100644 index 000000000000..777e2124fd8a --- /dev/null +++ b/0005-fix-MIN.patch @@ -0,0 +1,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
+
|