summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/strconv.cpp
diff options
context:
space:
mode:
author Westley M. Martinez <anikom15@gmail.com>2016-12-29 14:34:59 -0800
committer Westley M. Martinez <anikom15@gmail.com>2016-12-29 14:34:59 -0800
commit1fafe7706cbfcfc6e39c23c3c713fbb102557cbe (patch)
treee717407aa8f98f192a2095f28909c89f3af3a8e5 /src/osd/strconv.cpp
parentf7a98c4a969478fca51faf30f588d59631394bd9 (diff)
parent2b74e4c0be91b86b408fca518af7518c1ea994c9 (diff)
Merge https://github.com/mamedev/mame
Diffstat (limited to 'src/osd/strconv.cpp')
-rw-r--r--src/osd/strconv.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/osd/strconv.cpp b/src/osd/strconv.cpp
index d8fed98d687..9ea2e00bd1a 100644
--- a/src/osd/strconv.cpp
+++ b/src/osd/strconv.cpp
@@ -6,11 +6,8 @@
//
//============================================================
#if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS) || defined(OSD_UWP)
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
-#undef min
-#undef max
#include <algorithm>
#include <assert.h>
// MAMEOS headers