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

[Caolán McNamara]

 vcl/win/source/window/salframe.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b18377bbb5c7b558d70ecf10aaa8d731c738f5ee
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 4 11:24:08 2015 +0000

    silence warning from use of GetVersionExA in external multimon.h header
    
    Change-Id: I7979ff88c711ea018351e5235ea8bd98e2a9b56e

diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 1e0fb1a..e99a651 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -70,7 +70,10 @@
 #include <sallayout.hxx>
 
 #define COMPILE_MULTIMON_STUBS
+#pragma warning(push)
+#pragma warning(disable:4996)
 #include <multimon.h>
+#pragma warning(pop)
 #include <vector>
 #ifdef __MINGW32__
 #include <algorithm>