summaryrefslogtreecommitdiff
path: root/desktop/win32
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-16 11:26:51 +0200
committerMichael Stahl <mstahl@redhat.com>2016-02-16 10:37:55 +0000
commitce43d0ae9279edbf1ad108fe0d8325327a038d49 (patch)
treea0fbf7bbd608d1185005a0de36496c6f3656e798 /desktop/win32
parent049cf885c6e6c12ac9fa20bcb4ca1472de5b9115 (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/win32')
-rw-r--r--desktop/win32/source/applauncher/launcher.cxx12
1 files changed, 1 insertions, 11 deletions
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>