+ fixes #0001535: Remove conflict between min/max macros and std::min/max

This commit is contained in:
wmayer 2014-05-08 17:30:23 +02:00
parent 3b5cdda879
commit 6d17bbb7f6

View File

@ -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 <bitset>
#ifdef FC_OS_WIN32
# define NOMINMAX
# include <windows.h>
#endif
@ -74,11 +75,11 @@
#ifndef __InventorAll__
# include <Gui/InventorAll.h>
#endif
// Python
// Python
#include <Python.h>
#endif //_PreComp_
#endif // __PRECOMPILED_GUI__