xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx | 6 ------ xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 6 ------ xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 6 ------ xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx | 6 ------ 4 files changed, 24 deletions(-)
New commits: commit 26eee611cbc9f93b4531e1168eda72126cec2505 Author: Mike Kaganski <[email protected]> Date: Wed Jan 31 22:50:11 2018 +0300 xmlsecurity: MSVC: pragma warning: make more specific, remove obsolete Change-Id: I8303ba62198f4beb934623df7c52bf484a66a5e5 Reviewed-on: https://gerrit.libreoffice.org/49059 Tested-by: Jenkins <[email protected]> Reviewed-by: Mike Kaganski <[email protected]> diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx index beb5412654f0..9f005a88677e 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx @@ -20,17 +20,11 @@ #ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SANEXTENSION_MSCRYPTIMPL_HXX #define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SANEXTENSION_MSCRYPTIMPL_HXX -#ifdef _MSC_VER -#pragma warning(push,1) -#endif #if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif #include <Windows.h> #include <WinCrypt.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif #include <sal/config.h> #include <rtl/ustring.hxx> #include <cppuhelper/factory.hxx> diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 45fa3606fd9e..fb5d4b4cbbfa 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -22,17 +22,11 @@ #include <cstddef> #include <string.h> -#ifdef _MSC_VER -#pragma warning(push,1) -#endif #if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif #include <Windows.h> #include <WinCrypt.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif #include <sal/macros.h> #include <osl/thread.h> #include "securityenvironment_mscryptimpl.hxx" diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index c9a9b3fe7c0f..978ebb655fc4 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -20,17 +20,11 @@ #ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SECURITYENVIRONMENT_MSCRYPTIMPL_HXX #define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SECURITYENVIRONMENT_MSCRYPTIMPL_HXX -#ifdef _MSC_VER -#pragma warning(push,1) -#endif #if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif #include <windows.h> #include <wincrypt.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif #include <sal/config.h> #include <rtl/ustring.hxx> #include <cppuhelper/factory.hxx> diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx index b36b1c3c5d8f..0c71ac804b57 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx @@ -20,17 +20,11 @@ #ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_X509CERTIFICATE_MSCRYPTIMPL_HXX #define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_X509CERTIFICATE_MSCRYPTIMPL_HXX -#ifdef _MSC_VER -#pragma warning(push,1) -#endif #if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif #include <Windows.h> #include <WinCrypt.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif #include <sal/config.h> #include <rtl/ustring.hxx> #include <cppuhelper/factory.hxx> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
