From 7828f4377033f8dcceb8ff9368b6d613a1dd7b2b Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 17 Apr 2013 14:54:06 +0200
Subject: MSC needs those min/max macros after all

...otherwise, it will fail with "c:\program files\microsoft
sdks\windows\v7.1\include\GdiplusTypes.h(470) : error C3861: 'min': identifier
not found" errors.

Change-Id: Ib81ab7f5357b1f980202b63b144296fa252b71b1
---
 vcl/win/source/gdi/salgdi_gdiplus.cxx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index f26ccaa4e840..d1b9d0ae088f 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -26,6 +26,15 @@
 #include <win/saldata.hxx>
 #include <win/salgdi.h>
 
+#if defined _MSC_VER
+#ifndef min
+#define min(a,b)    (((a) < (b)) ? (a) : (b))
+#endif
+#ifndef max
+#define max(a,b)    (((a) > (b)) ? (a) : (b))
+#endif
+#endif
+
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
-- 
cgit