From 0f1f4c002f4436f13acaa29fffa335276667a4a2 Mon Sep 17 00:00:00 2001 From: In-line Date: Mon, 17 Jul 2017 22:18:45 +0400 Subject: [PATCH] Use mathlib.h in basetypes.h (#175) --- regamedll/extra/cssdk/public/basetypes.h | 14 +------------- regamedll/public/basetypes.h | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/regamedll/extra/cssdk/public/basetypes.h b/regamedll/extra/cssdk/public/basetypes.h index a953ffe9..9078a04c 100644 --- a/regamedll/extra/cssdk/public/basetypes.h +++ b/regamedll/extra/cssdk/public/basetypes.h @@ -15,6 +15,7 @@ #include "protected_things.h" #include "commonmacros.h" +#include "mathlib.h" // For backward compatibilty only... #include "tier0/platform.h" @@ -44,19 +45,6 @@ #define PAD_NUMBER(number, boundary) \ ( ((number) + ((boundary)-1)) / (boundary) ) * (boundary) -#ifndef MATHLIB_H -// In case this ever changes -#define M_PI 3.14159265358979323846 - -#ifndef min -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -#ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif -#endif // MATHLIB_H - #ifndef FALSE #define FALSE 0 #define TRUE (!FALSE) diff --git a/regamedll/public/basetypes.h b/regamedll/public/basetypes.h index 8929655d..52d81f91 100644 --- a/regamedll/public/basetypes.h +++ b/regamedll/public/basetypes.h @@ -15,6 +15,7 @@ #include "protected_things.h" #include "commonmacros.h" +#include "mathlib.h" // For backward compatibilty only... #include "tier0/platform.h" @@ -44,19 +45,6 @@ #define PAD_NUMBER(number, boundary) \ ( ((number) + ((boundary)-1)) / (boundary) ) * (boundary) -#ifndef MATHLIB_H -// In case this ever changes -#define M_PI 3.14159265358979323846 - -#ifndef min -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -#ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif -#endif // MATHLIB_H - #ifndef FALSE #define FALSE 0 #define TRUE (!FALSE)