diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 11:26:51 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-16 10:37:55 +0000 |
| commit | ce43d0ae9279edbf1ad108fe0d8325327a038d49 (patch) | |
| tree | a0fbf7bbd608d1185005a0de36496c6f3656e798 /desktop | |
| parent | 049cf885c6e6c12ac9fa20bcb4ca1472de5b9115 (diff) | |
use consistent #define checks for the Windows platform
stage 1 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
Change-Id: Iece73abdee530937e0737190b1aa97a46cd3075f
Reviewed-on: https://gerrit.libreoffice.org/22390
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 2 | ||||
| -rw-r--r-- | desktop/win32/source/applauncher/launcher.cxx | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index b2b1ba8ce0d1..8fe553206895 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -299,7 +299,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) exit(0); } #endif -#ifdef WIN32 +#ifdef _WIN32 /* fdo#57203 ignore -Embedding on Windows when LibreOffice is launched by COM+ */ diff --git a/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx index 69f7472a1129..2aac505e80b7 100644 --- a/desktop/win32/source/applauncher/launcher.cxx +++ b/desktop/win32/source/applauncher/launcher.cxx @@ -19,17 +19,7 @@ #include "launcher.hxx" -#ifndef _WINDOWS_ -# define WIN32_LEAN_AND_MEAN -#if defined _MSC_VER -#pragma warning(push, 1) -#endif -# include <windows.h> -# include <shellapi.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif -#endif +#include <shellapi.h> #include <stdlib.h> #include <malloc.h> |