diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-06-14 17:26:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-14 17:26:18 +0100 |
| commit | 5a0781a213c944900c5b84d3733c0b71934f817f (patch) | |
| tree | f3c00de237beb0ece45b6e6d696784946acdd6af | |
| parent | ff422b8b153289143d16857890cbe3c0b411cd54 (diff) | |
min/max foo for msvc
Change-Id: Icdb19eb9f8e3925f2da2d2ffe514f0da2bd14471
| -rw-r--r-- | vcl/win/source/gdi/salbmp.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
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 @@ -32,6 +32,15 @@ #include <map> #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 |