From d3e0a10813b3235631eb62a5b710b4d990b39f4b Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Fri, 28 Sep 2018 20:35:06 +0300 Subject: [PATCH] resume #define DISABLING_PARAMS_H and MATH_UTILS_H. We need merge xrPhysics/DisablingParams.h + xrGame/DisablingParams.h and xrPhysics/MathUtils.h + xrGame/MathUtils.h --- src/xrPhysics/DisablingParams.h | 5 ++++- src/xrPhysics/MathUtils.h | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/xrPhysics/DisablingParams.h b/src/xrPhysics/DisablingParams.h index a6caa208933..fd07f06c2ec 100644 --- a/src/xrPhysics/DisablingParams.h +++ b/src/xrPhysics/DisablingParams.h @@ -1,5 +1,6 @@ #pragma once - +#ifndef DISABLING_PARAMS_H +#define DISABLING_PARAMS_H #include "xrPhysics.h" // fwd. decl. @@ -28,3 +29,5 @@ struct SAllDDWParams }; extern SAllDDWParams worldDisablingParams; + +#endif diff --git a/src/xrPhysics/MathUtils.h b/src/xrPhysics/MathUtils.h index ca177ed728c..fbddab26c26 100644 --- a/src/xrPhysics/MathUtils.h +++ b/src/xrPhysics/MathUtils.h @@ -1,5 +1,6 @@ #pragma once - +#ifndef MATH_UTILS_H +#define MATH_UTILS_H #include "xrCore/_fbox.h" #include "xrCore/_obb.h" #include "xrPhysics.h" @@ -476,3 +477,5 @@ const float DET_CHECK_FATAL_EPS = 0.8f; // scale -35% !? ;) #else #define VERIFY_RMATRIX(M) #endif + +#endif // include guard