Merged in Muitxer/tracy (pull request #27)

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

View File

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