[Libreoffice-commits] core.git: desktop/source

[Markus Mohrhard]

 desktop/source/app/updater.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3b8db1ebc98d4a4ec54fd7be4ebc3aedc97b9f21
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Aug 14 17:57:10 2017 +0200

    updater: fix -Werror=undef problems
    
    Change-Id: I5a76a302419e911f541ad75e85ed6462ebe5f07f
    Reviewed-on: https://gerrit.libreoffice.org/41148
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index d1cd07d76f1e..445b13db2ec5 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -123,7 +123,7 @@ void CopyUpdaterToTempDir(const OUString& rInstallDirURL, const OUString& rTempD
 #ifdef UNX
 typedef char CharT;
 #define tstrncpy std::strncpy
-#elif _WIN32
+#elif defined(_WIN32)
 typedef wchar_t CharT;
 #define tstrncpy std::wcsncpy
 #else
@@ -134,7 +134,7 @@ void createStr(const OUString& rStr, CharT** pArgs, size_t i)
 {
 #ifdef UNX
     OString aStr = OUStringToOString(rStr, RTL_TEXTENCODING_UTF8);
-#elif _WIN32
+#elif defined(_WIN32)
     OUString aStr = rStr;
 #else
 #error "Need an implementation"
@@ -177,7 +177,7 @@ CharT** createCommandLine()
     {
 #ifdef UNX
         OUString aPID("0");
-#elif _WIN32
+#elif defined(_WIN32)
         oslProcessInfo aInfo;
         aInfo.Size = sizeof(oslProcessInfo);
         osl_getProcessInfo(nullptr, osl_Process_IDENTIFIER, &aInfo);
@@ -290,7 +290,7 @@ bool update()
             printf("execv failed with error %d %s\n",errno,strerror(errno));
             bSuccess = false;
         }
-#elif _WIN32
+#elif defined(_WIN32)
         bSuccess = WinLaunchChild((wchar_t*)aUpdaterPath.getStr(), 8, pArgs);
 #endif
     }