From 09d633005fd051c4e0877bff2094632e15cf2abb Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 20 Apr 2003 12:52:45 +0000 Subject: [PATCH] changed min/max to one function each (if it's missing) to remove ambiguity --- stepmania/src/RageUtil.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h index 49bcd6bd85..3bb1107083 100644 --- a/stepmania/src/RageUtil.h +++ b/stepmania/src/RageUtil.h @@ -25,14 +25,14 @@ #define COPY(a,b) { ASSERT(sizeof(a)==sizeof(b)); memcpy(&a, &b, sizeof(a)); } /* Common harmless mismatches. */ +/* replace both with a single function (same with max) + * --Steve */ #ifndef min -inline float min(float a, int b) { return a < b? a:b; } -inline float min(int a, float b) { return a < b? a:b; } +inline float min(float a, float b) { return a < b? a:b; } #endif #ifndef max -inline float max(float a, int b) { return a > b? a:b; } -inline float max(int a, float b) { return a > b? a:b; } +inline float max(float a, float b) { return a > b? a:b; } #endif /* Traditional defines. Only use this if you absolutely need