embeddedobj: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Iefcaf1f5ae73050300879fff0855f709c5f8a30d Reviewed-on: https://gerrit.libreoffice.org/48975 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
parent
f901bc5ac0
commit
dad539c0dd
@ -23,21 +23,12 @@
|
|||||||
#define STRICT
|
#define STRICT
|
||||||
#define _ATL_APARTMENT_THREADED
|
#define _ATL_APARTMENT_THREADED
|
||||||
|
|
||||||
#if defined _MSC_VER
|
|
||||||
#pragma warning(push, 1)
|
|
||||||
#pragma warning(disable: 4548 4555 4917)
|
|
||||||
#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 <ole2.h>
|
#include <ole2.h>
|
||||||
|
|
||||||
#if defined _MSC_VER
|
|
||||||
#pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user