vcl/win/source/gdi/salbmp.cxx | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 5a0781a213c944900c5b84d3733c0b71934f817f
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jun 14 17:26:18 2013 +0100
min/max foo for msvc
Change-Id: Icdb19eb9f8e3925f2da2d2ffe514f0da2bd14471
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index af09b16..72bc268 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
