diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-18 17:34:28 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-18 19:24:31 +0200 |
| commit | aaa26a58ba0f14eab652e0ba7f8d8e66fa479582 (patch) | |
| tree | 34299e87165aa7cc6c38c357b7e4deddaef76816 /jvmfwk | |
| parent | 3c1f44c91091205512098bb4f1d56333c20a1f8b (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 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 3 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 3 | ||||
| -rw-r--r-- | jvmfwk/source/fwkutil.cxx | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index b435aa846669..5d28e0240b58 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -21,6 +21,9 @@ #ifdef _WIN32 # include <stdio.h> # include <sys/stat.h> +# if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif # include <windows.h> #endif diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 798fae528bb6..f1bf45816af6 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -42,6 +42,9 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #if defined _MSC_VER #pragma warning(pop) diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx index 6f964580308b..fbb885b1d0c2 100644 --- a/jvmfwk/source/fwkutil.cxx +++ b/jvmfwk/source/fwkutil.cxx @@ -22,6 +22,9 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #if defined _MSC_VER #pragma warning(pop) |