Merged in Muitxer/tracy (pull request #28)

Moved NoMinMax before windows.h
This commit is contained in:
Miguel Fernandez 2018-12-24 19:06:51 +00:00 committed by Bartosz Taudul
commit 5e4b5850af

View File

@ -1,12 +1,12 @@
#ifdef TRACY_ENABLE #ifdef TRACY_ENABLE
#ifdef _MSC_VER #ifdef _MSC_VER
# include <winsock2.h>
# include <windows.h>
# include <tlhelp32.h>
# ifndef NOMINMAX # ifndef NOMINMAX
# define NOMINMAX # define NOMINMAX
# endif # endif
# include <winsock2.h>
# include <windows.h>
# include <tlhelp32.h>
#else #else
# include <sys/time.h> # include <sys/time.h>
#endif #endif