mirror of
https://github.com/fortressforever/fortressforever-2013.git
synced 2024-11-22 04:21:38 +00:00
undef min/max before standard header usages to fix gcc compile errors
This commit is contained in:
parent
6eb9176ec2
commit
71a29f46ef
3 changed files with 12 additions and 1 deletions
|
@ -6,7 +6,9 @@
|
|||
#include <vgui_controls/Panel.h>
|
||||
#include "vgui_controls/EditablePanel.h"
|
||||
|
||||
#include "tier0/valve_minmax_off.h"
|
||||
#include "luabind/object.hpp"
|
||||
#include "tier0/valve_minmax_on.h"
|
||||
|
||||
class CFF_CL_LuaUI_BasePanel : public CHudElement, public vgui::EditablePanel
|
||||
{
|
||||
|
@ -60,4 +62,4 @@ private:
|
|||
Panel *_extentsGrip;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -1,7 +1,11 @@
|
|||
#pragma once
|
||||
#include "cbase.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 "tier0/valve_minmax_on.h"
|
||||
|
||||
#define FF_COMMAND(cmd, desc) \
|
||||
void CliCmdFunc_##cmd(const CCommand &args) \
|
||||
|
|
|
@ -1,6 +1,11 @@
|
|||
#include "cbase.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 "tier0/valve_minmax_on.h"
|
||||
|
||||
|
||||
#ifdef GAME_DLL
|
||||
#include "entitylist.h"
|
||||
|
|
Loading…
Reference in a new issue