X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cg_math.h;h=e3dcece694218ddb0b951880c4a22a2197f8d38d;hb=05b6edf1a4dac900a2d587ce8f26077642ba1792;hp=e7921e836804da5410f334c3649b3eef91edb23c;hpb=ff5947f97081e10c4ce112d4d51c2d1fa14ebba8;p=xonotic%2Fdarkplaces.git

diff --git a/cg_math.h b/cg_math.h
index e7921e83..e3dcece6 100644
--- a/cg_math.h
+++ b/cg_math.h
@@ -32,6 +32,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define M_PI		3.14159265358979323846	// matches value in gcc v2 math.h
 #endif
 
+#ifndef NULL
+#define NULL ((void *)0)
+#endif
+
 typedef float vec_t;
 typedef vec_t vec2_t[2];
 typedef vec_t vec3_t[3];
@@ -46,11 +50,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))
@@ -99,3 +103,4 @@ void AngleMatrix (vec3_t angles, vec3_t translate, vec_t matrix[][4]);
 void VectorVectors(const vec3_t forward, vec3_t right, vec3_t up);
 
 #endif
+