From 81c6d549301b0b979d1c44faa6389cd13882cf92 Mon Sep 17 00:00:00 2001 From: havoc Date: Wed, 17 Jul 2002 05:18:31 +0000 Subject: [PATCH] put parentheses around parameters to min/max/bound macros git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2044 d7cf8633-e32d-0410-b094-e92efae38249 --- mathlib.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mathlib.h b/mathlib.h index 65c187b3..afb24dde 100644 --- a/mathlib.h +++ b/mathlib.h @@ -42,11 +42,11 @@ extern vec3_t vec3_origin; #define nanmask (255<<23) #define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask) -#define bound(min,num,max) (num >= min ? (num < max ? num : max) : min) +#define bound(min,num,max) ((num) >= (min) ? ((num) < (max) ? (num) : (max)) : (min)) #ifndef min -#define min(A,B) (A < B ? A : B) -#define max(A,B) (A > B ? A : B) +#define min(A,B) ((A) < (B) ? (A) : (B)) +#define max(A,B) ((A) > (B) ? (A) : (B)) #endif #define lhrandom(MIN,MAX) ((rand() & 32767) * (((MAX)-(MIN)) * (1.0f / 32767.0f)) + (MIN)) -- 2.39.2