diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-31 12:39:29 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-01 06:52:53 +0100 |
| commit | be13e756d64c461681c79457b5de4a22b6ec00d4 (patch) | |
| tree | b49647ad5d03c8ed37720e26136708b8a1093423 /desktop/win32 | |
| parent | b23e4d2bace6eb4729d58fbb7cad4e99ce1aad94 (diff) | |
desktop: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I61ed9700c904b7499166d32e4ffda69811d64a8b
Reviewed-on: https://gerrit.libreoffice.org/48973
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'desktop/win32')
| -rw-r--r-- | desktop/win32/source/QuickStart/QuickStart.cxx | 6 | ||||
| -rw-r--r-- | desktop/win32/source/guistdio/guistdio.inc | 6 | ||||
| -rw-r--r-- | desktop/win32/source/unoinfo.cxx | 6 |
3 files changed, 0 insertions, 18 deletions
diff --git a/desktop/win32/source/QuickStart/QuickStart.cxx b/desktop/win32/source/QuickStart/QuickStart.cxx index 0cc673c77191..476f6533d530 100644 --- a/desktop/win32/source/QuickStart/QuickStart.cxx +++ b/desktop/win32/source/QuickStart/QuickStart.cxx @@ -21,15 +21,9 @@ #include <sal/config.h> -#if defined _MSC_VER -#pragma warning(push, 1) -#endif #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <shellapi.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif #include "resource.h" #include <systools/win32/uwinapi.h> diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc index 5d6634bb9c5c..eb1b9cda1639 100644 --- a/desktop/win32/source/guistdio/guistdio.inc +++ b/desktop/win32/source/guistdio/guistdio.inc @@ -18,13 +18,7 @@ */ #define WIN32_LEAN_AND_MEAN -#ifdef _MSC_VER -#pragma warning(push,1) // disable warnings within system headers -#endif #include <windows.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif #include <string.h> #include <stdlib.h> diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx index 3ee7e7750335..3a41b6e0985e 100644 --- a/desktop/win32/source/unoinfo.cxx +++ b/desktop/win32/source/unoinfo.cxx @@ -23,13 +23,7 @@ #include <wchar.h> #define WIN32_LEAN_AND_MEAN -#if defined _MSC_VER -#pragma warning(push, 1) -#endif #include <windows.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif #include <tools/pathutils.hxx> |