forked from Mirrors/openclonk
undef "s" macro in C4Config
Necessary for unity builds, but also has a high conflict probability in general.master
parent
ca11d86893
commit
a73e5fc871
|
@ -270,6 +270,8 @@ void C4ConfigControls::CompileFunc(StdCompiler *pComp)
|
|||
#endif
|
||||
}
|
||||
|
||||
#undef s
|
||||
|
||||
C4Config::C4Config()
|
||||
{
|
||||
Default();
|
||||
|
|
Loading…
Reference in New Issue