Partial OSX support

[xonotic/netradiant.git] / libs / splines / q_shared.h

diff --git a/libs/splines/q_shared.h b/libs/splines/q_shared.h
index 6cad80bc97eec9ac4f5e2b8cbaa6e7a1e57874d9..80e11b22d5718778d59d580a1a0d04938c57d4f1 100644 (file)
--- a/libs/splines/q_shared.h
+++ b/libs/splines/q_shared.h
@@ -62,7 +62,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <time.h>
 #include <ctype.h>
 #ifdef WIN32                // mac doesn't have malloc.h
@@ -228,11 +228,6 @@ typedef enum {
 #define MAX_QINT            0x7fffffff
 #define MIN_QINT            ( -MAX_QINT - 1 )
 
-#ifndef max
-#define max( x, y ) ( ( ( x ) > ( y ) ) ? ( x ) : ( y ) )
-#define min( x, y ) ( ( ( x ) < ( y ) ) ? ( x ) : ( y ) )
-#endif
-
 #ifndef sign
 #define sign( f )   ( ( f > 0 ) ? 1 : ( ( f < 0 ) ? -1 : 0 ) )
 #endif