mirror of
https://github.com/ZDoom/Raze.git
synced 2025-05-30 00:41:24 +00:00
- Replace MAX()
from templates.h
with version provided in STL.
# Conflicts: # source/common/textures/hw_ihwtexture.cpp # source/common/utility/templates.h
This commit is contained in:
parent
57b638f26f
commit
9894729fc2
52 changed files with 115 additions and 134 deletions
|
@ -1092,7 +1092,7 @@ void C_SearchForPullins(FExecList *exec, const char *file, FCommandLine &argv)
|
|||
|
||||
lastSlash1 = strrchr(file, '/');
|
||||
lastSlash2 = strrchr(file, '\\');
|
||||
lastSlash = MAX(lastSlash1, lastSlash2);
|
||||
lastSlash = max(lastSlash1, lastSlash2);
|
||||
#endif
|
||||
|
||||
for (int i = 1; i < argv.argc(); ++i)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue