summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2017-09-18 17:34:28 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2017-09-18 19:24:31 +0200
commitaaa26a58ba0f14eab652e0ba7f8d8e66fa479582 (patch)
tree34299e87165aa7cc6c38c357b7e4deddaef76816 /embeddedobj
parent3c1f44c91091205512098bb4f1d56333c20a1f8b (diff)
Some more WIN32_LEAN_AND_MEAN
Change-Id: Iadb0ebb66809c192fb817b8c7cf2f8cdb4d0b874 Reviewed-on: https://gerrit.libreoffice.org/42419 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/msole/platform.h4
-rw-r--r--embeddedobj/test/Container1/nativelib/nativeview.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/embeddedobj/source/msole/platform.h b/embeddedobj/source/msole/platform.h
index c69263894e35..8e5faeecf546 100644
--- a/embeddedobj/source/msole/platform.h
+++ b/embeddedobj/source/msole/platform.h
@@ -28,7 +28,11 @@
#pragma warning(disable: 4548 4555 4917)
#endif
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
#include "windows.h"
+#include <ole2.h>
#if defined _MSC_VER
#pragma warning(pop)
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
index dfd1adbac972..29dd49437e0b 100644
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
@@ -19,6 +19,9 @@
#ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
#include <windows.h>
// property name to register own window procedure on hwnd
#define OLD_PROC_KEY "oldwindowproc"