diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-17 14:54:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-17 14:54:06 +0200 |
| commit | 7828f4377033f8dcceb8ff9368b6d613a1dd7b2b (patch) | |
| tree | 5c3ac4c2a697682832d5b39fa014ca54fd3c6a61 /vcl | |
| parent | ffcdefe83ab043edef943657d5dedef75faaa5b0 (diff) | |
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
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/gdi/salgdi_gdiplus.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
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 @@ -27,6 +27,15 @@ #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 |