[Libreoffice-commits] core.git: pyuno/inc pyuno/zipcore

[Mike Kaganski]

 pyuno/inc/pyuno.hxx      |    6 ------
 pyuno/zipcore/python.cxx |    2 --
 2 files changed, 8 deletions(-)

New commits:
commit 17b22047a7fac6592c0c0b23072c36c7e0d46a84
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 20:46:58 2018 +0300

    pyuno: MSVC: pragma warning: make more specific, remove obsolete
    
    Change-Id: Id907f466bc9dc45f3e522fb948488eb35c011bfe
    Reviewed-on: https://gerrit.libreoffice.org/49041
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/pyuno/inc/pyuno.hxx b/pyuno/inc/pyuno.hxx
index e2d0c38de640..04c42de6e93f 100644
--- a/pyuno/inc/pyuno.hxx
+++ b/pyuno/inc/pyuno.hxx
@@ -21,13 +21,7 @@
 #define INCLUDED_PYUNO_INC_PYUNO_HXX
 
 #ifndef Py_PYTHON_H
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <Python.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 #endif // #ifdef Py_PYTHON_H
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/script/CannotConvertException.hpp>
diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx
index 9c6ef836311f..c26d58c36fb8 100644
--- a/pyuno/zipcore/python.cxx
+++ b/pyuno/zipcore/python.cxx
@@ -24,9 +24,7 @@
 #include <wchar.h>
 
 #define WIN32_LEAN_AND_MEAN
-#pragma warning(push, 1)
 #include <windows.h>
-#pragma warning(pop)
 
 #include <tools/pathutils.hxx>