From 5a0781a213c944900c5b84d3733c0b71934f817f Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 14 Jun 2013 17:26:18 +0100 Subject: min/max foo for msvc Change-Id: Icdb19eb9f8e3925f2da2d2ffe514f0da2bd14471 --- vcl/win/source/gdi/salbmp.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index af09b162754b..72bc268d1d35 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -31,6 +31,15 @@ #include #include +#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