From 76794648691b1888e6d9be4b5ce95ba47a468079 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 31 Aug 2020 20:08:08 +0300 Subject: [PATCH] features.h: fix conflicting with glibc header --- cl_dll/render/gl_local.h | 4 ++-- common/{features.h => enginefeatures.h} | 0 dlls/physic.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename common/{features.h => enginefeatures.h} (100%) diff --git a/cl_dll/render/gl_local.h b/cl_dll/render/gl_local.h index c24c2b8..2be1a76 100644 --- a/cl_dll/render/gl_local.h +++ b/cl_dll/render/gl_local.h @@ -25,7 +25,7 @@ GNU General Public License for more details. #include "gl_frustum.h" #include "gl_primitive.h" #include "cl_dlight.h" -#include "features.h" +#include "enginefeatures.h" #include #include @@ -995,4 +995,4 @@ void ParseRain( void ); void ResetRain( void ); void InitRain( void ); -#endif//GL_LOCAL_H \ No newline at end of file +#endif//GL_LOCAL_H diff --git a/common/features.h b/common/enginefeatures.h similarity index 100% rename from common/features.h rename to common/enginefeatures.h diff --git a/dlls/physic.cpp b/dlls/physic.cpp index 514f60e..09ed60f 100644 --- a/dlls/physic.cpp +++ b/dlls/physic.cpp @@ -23,7 +23,7 @@ GNU General Public License for more details. #include "gamerules.h" #include "game.h" #include "com_model.h" -#include "features.h" +#include "enginefeatures.h" #include "triangleapi.h" #include "render_api.h" #include "pm_shared.h" @@ -325,4 +325,4 @@ int Server_GetPhysicsInterface( int iVersion, server_physics_api_t *pfuncsFromEn g_fPhysicInitialized = TRUE; return TRUE; -} \ No newline at end of file +}