From 063786bf025ffb5c8f2eec0f46b8126e46bc4f22 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Mon, 7 Dec 2015 14:37:46 -0800 Subject: [PATCH] build: fix spurious errors in VS2015 IDE --- include/common/cmdlib.h | 1 + include/common/mathlib.h | 4 ++-- qbsp/qbsp.h | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/common/cmdlib.h b/include/common/cmdlib.h index 34bcf774..242fef9f 100644 --- a/include/common/cmdlib.h +++ b/include/common/cmdlib.h @@ -41,6 +41,7 @@ typedef unsigned char byte; #ifdef _MSC_VER #define __func__ __FUNCTION__ +#define inline __inline #endif #ifdef __GNUC__ diff --git a/include/common/mathlib.h b/include/common/mathlib.h index 2768ca7b..39c04c68 100644 --- a/include/common/mathlib.h +++ b/include/common/mathlib.h @@ -24,10 +24,10 @@ #include #ifdef DOUBLEVEC_T -typedef double vec_t; +#define vec_t double #define VECT_MAX DBL_MAX; #else -typedef float vec_t; +#define vec_t float #define VECT_MAX FLT_MAX; #endif typedef vec_t vec3_t[3]; diff --git a/qbsp/qbsp.h b/qbsp/qbsp.h index a7e5e678..4ff340a0 100644 --- a/qbsp/qbsp.h +++ b/qbsp/qbsp.h @@ -44,6 +44,7 @@ #ifdef _MSC_VER #define __func__ __FUNCTION__ +#define inline __inline #endif #ifndef __GNUC__ @@ -188,10 +189,10 @@ char *copystring(const char *s); //===== mathlib.h #ifdef DOUBLEVEC_T -typedef double vec_t; +#define vec_t double #define VECT_MAX DBL_MAX #else -typedef float vec_t; +#define vec_t float #define VECT_MAX FLT_MAX #endif typedef vec_t vec3_t[3];