From 6d17bbb7f6d9531a0094c3a67df487d6a6567286 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 8 May 2014 17:30:23 +0200 Subject: [PATCH] + fixes #0001535: Remove conflict between min/max macros and std::min/max --- src/Mod/Sketcher/Gui/PreCompiled.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Mod/Sketcher/Gui/PreCompiled.h b/src/Mod/Sketcher/Gui/PreCompiled.h index 7306be681..de7b683c7 100644 --- a/src/Mod/Sketcher/Gui/PreCompiled.h +++ b/src/Mod/Sketcher/Gui/PreCompiled.h @@ -33,7 +33,7 @@ # define PartGuiExport __declspec(dllimport) # define SketcherGuiExport __declspec(dllexport) #else // for Linux -# define SketcherExport +# define SketcherExport # define PartExport # define PartAppExport # define PartGuiExport @@ -60,6 +60,7 @@ #include #ifdef FC_OS_WIN32 +# define NOMINMAX # include #endif @@ -74,11 +75,11 @@ #ifndef __InventorAll__ # include #endif - -// Python + +// Python #include - + #endif //_PreComp_ #endif // __PRECOMPILED_GUI__