summaryrefslogtreecommitdiff
path: root/src/Config.h
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2012-09-06 23:49:50 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-09-06 23:53:29 (GMT)
commit5a91b83875c8a25e36ecdcddb6c79de61125da39 (patch)
treefdaa6d76756ca7164f913726fdeba22ec1aef4be /src/Config.h
parent710583f0fc00184e15404d4551abf9a424275452 (diff)
downloadpowder-5a91b83875c8a25e36ecdcddb6c79de61125da39.zip
powder-5a91b83875c8a25e36ecdcddb6c79de61125da39.tar.gz
revert changing the lua/sdl includes and min/max changes
Diffstat (limited to 'src/Config.h')
-rw-r--r--src/Config.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Config.h b/src/Config.h
index 385f216..12de570 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -183,10 +183,10 @@ extern unsigned char ZSIZE;
#define strcasecmp stricmp
#endif
#if defined(_MSC_VER)
-#define fmin(a,b) (((a) < (b)) ? (a) : (b))
-#define fminf(a,b) (((a) < (b)) ? (a) : (b))
-#define fmax(a,b) (((a) > (b)) ? (a) : (b))
-#define fmaxf(a,b) (((a) > (b)) ? (a) : (b))
+#define fmin min
+#define fminf min
+#define fmax max
+#define fmaxf max
#endif
#if defined(_MSC_VER)