summaryrefslogtreecommitdiff
path: root/jvmfwk/plugins
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-01-31 16:16:37 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-02-01 17:56:41 +0100
commit94a5665ef3c0fa594048dd425772c4be29d9d7da (patch)
tree1fea1fe386e72adc36c99784e1d9ca192dd0ac5e /jvmfwk/plugins
parent1e96364cf016097ab01ef933fff02f629e7b1884 (diff)
jvmfwk: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Ibb69ba9c994e44c162318e40c4469c311309f326 Reviewed-on: https://gerrit.libreoffice.org/48996 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'jvmfwk/plugins')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx6
1 files changed, 0 insertions, 6 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index fd6680ae07e1..fb6ec2ba6eb4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -39,16 +39,10 @@
#include <map>
#if defined(_WIN32)
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
#endif
#include <string.h>