FWGS
/
Paranoia2
forked from a1batross/Paranoia2_original
2
0
Fork 2
Code Issues Pull Requests 1 Releases Wiki Activity

features.h: fix conflicting with glibc header

This commit is contained in:
Alibek Omarov 2020-08-31 20:08:08 +03:00
parent b3aa71dfe4
commit 7679464869
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cl_dll/render/gl_local.h
View File

@ -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 <utlarray.h>
#include <matrix.h>
@ -995,4 +995,4 @@ void ParseRain( void );
void ResetRain( void );
void InitRain( void );
#endif//GL_LOCAL_H
#endif//GL_LOCAL_H

0
common/features.h → common/enginefeatures.h
View File

4
dlls/physic.cpp
View File

@ -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;
}
}