[Libreoffice-commits] core.git: 2 commits - onlineupdate/inc

[Markus Mohrhard]

 onlineupdate/inc/winhelper/windowsStart.hxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 9d184e2cc9a9a78a61ae9b91a66e1153f778d9a4
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Aug 7 10:53:45 2017 +0200

    updater: add include guard for windows process start code
    
    Change-Id: If021a92163381f2221faa1c7121f6c4af2d51dcf
    Reviewed-on: https://gerrit.libreoffice.org/40836
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/onlineupdate/inc/winhelper/windowsStart.hxx b/onlineupdate/inc/winhelper/windowsStart.hxx
index e34e7d15ca22..7a9d54a506f2 100644
--- a/onlineupdate/inc/winhelper/windowsStart.hxx
+++ b/onlineupdate/inc/winhelper/windowsStart.hxx
@@ -3,6 +3,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef INCLUDED_ONLINEUPDATE_INC_WINSTART_HXX
+#define INCLUDED_ONLINEUPDATE_INC_WINSTART_HXX
+
 #ifdef _WIN32
 #include <windows.h>
 #endif
@@ -19,3 +22,5 @@ WinLaunchChild(const wchar_t *exePath, int argc,
                HANDLE *hProcess = nullptr);
 
 wchar_t* MakeCommandLine(int argc, WCHAR **argv);
+
+#endif
commit a5cda5603c3f71851a987c24d36433ce269c66f8
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Aug 7 09:34:21 2017 +0200

    updater: use the correct define check
    
    Change-Id: I79f47da401732e39bbce778d5b3971d6024a7935
    Reviewed-on: https://gerrit.libreoffice.org/40835
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/onlineupdate/inc/winhelper/windowsStart.hxx b/onlineupdate/inc/winhelper/windowsStart.hxx
index 5baedc840416..e34e7d15ca22 100644
--- a/onlineupdate/inc/winhelper/windowsStart.hxx
+++ b/onlineupdate/inc/winhelper/windowsStart.hxx
@@ -3,10 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifdef XP_WIN
+#ifdef _WIN32
 #include <windows.h>
-#else
-#include <limits.h>
 #endif