diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-17 13:38:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-17 13:38:19 +0200 |
| commit | adae41c0ed01ff7476acb584ddf636f1162e68ea (patch) | |
| tree | 6047c3b2c52ad9d6506202fe0c7b05c437b377d8 /vcl | |
| parent | bea18dd581ac9341a19e757a72662ab7a2e34b0a (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: Ie58a5e85e6712e4244ce4799c203b31a717a91e6
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 40edba10c234..ef43804c1afe 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -44,6 +44,15 @@ #include <salsys.hxx> #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) #pragma warning( disable: 4917 ) #endif |