summaryrefslogtreecommitdiffstats
path: root/include/prewin.h
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-01-31 16:14:43 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-02-01 17:57:00 +0100
commit8e07fb35074e0f23e7676cdf4499582b7c3c1bbb (patch)
tree755f8d876d3edacc985693e1f67afe5c59d10180 /include/prewin.h
parentjvmfwk: MSVC: pragma warning: make more specific, remove obsolete (diff)
downloadcore-8e07fb35074e0f23e7676cdf4499582b7c3c1bbb.tar.gz
core-8e07fb35074e0f23e7676cdf4499582b7c3c1bbb.zip
include: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Iba5ffe646e5a6cf8ecfb635c21546025fc5606db Reviewed-on: https://gerrit.libreoffice.org/48995 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/prewin.h')
-rw-r--r--include/prewin.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/include/prewin.h b/include/prewin.h
index f0371654c2c6..ebdf4aaf518f 100644
--- a/include/prewin.h
+++ b/include/prewin.h
@@ -34,32 +34,16 @@
#if !defined STRICT
# define STRICT
#endif
-#ifdef _MSC_VER
-# pragma warning(push, 1)
-# pragma warning (disable: 4005)
-#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
#include <shellapi.h>
#include <commdlg.h>
#include <dlgs.h>
-#ifdef _MSC_VER
-# pragma warning(push, 1)
-#endif
-
#include <commctrl.h>
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */