From: smalcom Date: Thu, 15 Sep 2016 19:25:34 +0000 (+0300) Subject: [F] min/max redefined when including windows.h X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dad4d0fa991247fa7ff16c385988b7fd7f41e076;p=platform%2Fupstream%2Fassimp.git [F] min/max redefined when including windows.h --- diff --git a/contrib/Open3DGC/o3dgcTimer.h b/contrib/Open3DGC/o3dgcTimer.h index 303d4f7..97f5759 100644 --- a/contrib/Open3DGC/o3dgcTimer.h +++ b/contrib/Open3DGC/o3dgcTimer.h @@ -27,6 +27,8 @@ THE SOFTWARE. #include "o3dgcCommon.h" #ifdef WIN32 +/* Thank you, Microsoft, for file WinDef.h with min/max redefinition. */ +#define NOMINMAX #include #elif __MACH__ #include