mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-23 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged in Muitxer/tracy (pull request #27)

Browse Source 
Avoid conflicts with min/max macros
This commit is contained in:
Miguel Fernandez 2018-12-24 18:50:19 +00:00 committed by Bartosz Taudul
commit 1a50a15212
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/TracyProfiler.cpp
View File

@ -4,6 +4,9 @@
# include <winsock2.h> # include <winsock2.h>
# include <windows.h> # include <windows.h>
# include <tlhelp32.h> # include <tlhelp32.h>
# ifndef NOMINMAX
# define NOMINMAX
# endif
#else #else
# include <sys/time.h> # include <sys/time.h>
#endif #endif