fortressforever/fortressforever-2013
0
0
Fork 0
mirror of https://github.com/fortressforever/fortressforever-2013.git synced 2025-02-16 17:12:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

undef min/max before standard header usages to fix gcc compile errors

Browse source
This commit is contained in:
Dexter 2014-03-18 04:59:43 +00:00 committed by squeek
parent 6eb9176ec2
commit 71a29f46ef
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mp/src/game/client/ff/ui/ff_cl_luaui_basepanel.h
View file

@ -6,7 +6,9 @@
#include <vgui_controls/Panel.h> #include <vgui_controls/Panel.h>
#include "vgui_controls/EditablePanel.h" #include "vgui_controls/EditablePanel.h"
#include "tier0/valve_minmax_off.h"
#include "luabind/object.hpp" #include "luabind/object.hpp"
#include "tier0/valve_minmax_on.h"
class CFF_CL_LuaUI_BasePanel : public CHudElement, public vgui::EditablePanel class CFF_CL_LuaUI_BasePanel : public CHudElement, public vgui::EditablePanel
{ {
@ -60,4 +62,4 @@ private:
Panel *_extentsGrip; Panel *_extentsGrip;
}; };
#endif #endif

4
mp/src/game/shared/ff/ff_sh_playercommands.h
View file

@ -1,7 +1,11 @@
#pragma once #pragma once
#include "cbase.h" #include "cbase.h"
#include "ff_sh_player.h" #include "ff_sh_player.h"
// dexter: beware valve min/max messes up stl on gcc 4.2+
#include "tier0/valve_minmax_off.h"
#include <string> #include <string>
#include "tier0/valve_minmax_on.h"
#define FF_COMMAND(cmd, desc) \ #define FF_COMMAND(cmd, desc) \
void CliCmdFunc_##cmd(const CCommand &args) \ void CliCmdFunc_##cmd(const CCommand &args) \

5
mp/src/game/shared/ff/ff_sh_team_manager.cpp
View file

@ -1,6 +1,11 @@
#include "cbase.h" #include "cbase.h"
#include "ff_sh_team_manager.h" #include "ff_sh_team_manager.h"
// beware min/max messes up stl stuff, so turn off momentarily
#include "tier0/valve_minmax_off.h"
#include <map> #include <map>
#include "tier0/valve_minmax_on.h"
#ifdef GAME_DLL #ifdef GAME_DLL
#include "entitylist.h" #include "entitylist.h"