summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Oliver Stöneberg <firewave@users.noreply.github.com>2013-09-24 16:12:42 +0000
committer Oliver Stöneberg <firewave@users.noreply.github.com>2013-09-24 16:12:42 +0000
commit3ea1274cf2e134ae5ef56fb534af34643450f0a3 (patch)
treefb8d28986ff843c4f394ffe6287e11ae749a9510 /src/osd
parent0ad10db25d332ac3105b4511a4f5417ff26fc578 (diff)
reverted changes to src/osd/windows/winprefix.h (nw)
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/windows/winprefix.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/osd/windows/winprefix.h b/src/osd/windows/winprefix.h
index 4ccad8a7d7d..1287b840206 100644
--- a/src/osd/windows/winprefix.h
+++ b/src/osd/windows/winprefix.h
@@ -57,6 +57,8 @@
#ifndef alloca
#define alloca __builtin_alloca
#endif
+#define min(x,y) fmin(x,y)
+#define max(x,y) fmax(x,y)
#endif
#define PATH_SEPARATOR "\\"