[Libreoffice-commits] core.git: vcl/win

[Stephan Bergmann]

 vcl/win/source/app/salinst.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit adae41c0ed01ff7476acb584ddf636f1162e68ea
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 17 13:38:19 2013 +0200

    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

diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 40edba1..ef43804 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