From ba4e0300d3b748a59372553f7a64036a98fccf41 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 12 Jun 2012 10:16:38 +0200 Subject: Fix build on Windows after qdatetime.h cleanup Define NOMINMAX before including windows system header files, to prevent them from defining min/max as macros and thus breaking the usage of std::min/max in qdatetime.h Change-Id: I75573ae0bf05a40558a5eb1626bd3a296ee818da Reviewed-by: Thiago Macieira --- src/3rdparty/phonon/ds9/videorenderer_soft.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp index 0e04e85..8a2107f 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp +++ b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp @@ -15,6 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ +// Prevent windows system header files from defining min/max. +#define NOMINMAX #include "videorenderer_soft.h" -- cgit v1.2.3