Kaydet (Commit) 26eee611 authored tarafından Mike Kaganski's avatar Mike Kaganski

xmlsecurity: MSVC: pragma warning: make more specific, remove obsolete

Change-Id: I8303ba62198f4beb934623df7c52bf484a66a5e5
Reviewed-on: https://gerrit.libreoffice.org/49059Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst c7f1a8a8
...@@ -20,17 +20,11 @@ ...@@ -20,17 +20,11 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SANEXTENSION_MSCRYPTIMPL_HXX #ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SANEXTENSION_MSCRYPTIMPL_HXX
#define 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 #if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif #endif
#include <Windows.h> #include <Windows.h>
#include <WinCrypt.h> #include <WinCrypt.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <sal/config.h> #include <sal/config.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
......
...@@ -22,17 +22,11 @@ ...@@ -22,17 +22,11 @@
#include <cstddef> #include <cstddef>
#include <string.h> #include <string.h>
#ifdef _MSC_VER
#pragma warning(push,1)
#endif
#if !defined WIN32_LEAN_AND_MEAN #if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif #endif
#include <Windows.h> #include <Windows.h>
#include <WinCrypt.h> #include <WinCrypt.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <sal/macros.h> #include <sal/macros.h>
#include <osl/thread.h> #include <osl/thread.h>
#include "securityenvironment_mscryptimpl.hxx" #include "securityenvironment_mscryptimpl.hxx"
......
...@@ -20,17 +20,11 @@ ...@@ -20,17 +20,11 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SECURITYENVIRONMENT_MSCRYPTIMPL_HXX #ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SECURITYENVIRONMENT_MSCRYPTIMPL_HXX
#define 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 #if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif #endif
#include <windows.h> #include <windows.h>
#include <wincrypt.h> #include <wincrypt.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <sal/config.h> #include <sal/config.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
......
...@@ -20,17 +20,11 @@ ...@@ -20,17 +20,11 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_X509CERTIFICATE_MSCRYPTIMPL_HXX #ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_X509CERTIFICATE_MSCRYPTIMPL_HXX
#define 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 #if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif #endif
#include <Windows.h> #include <Windows.h>
#include <WinCrypt.h> #include <WinCrypt.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <sal/config.h> #include <sal/config.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment