diff options
| author | A_GAN <ganzouri97@gmail.com> | 2020-01-25 04:33:09 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-25 22:02:16 +0100 |
| commit | 42e811a80a3c6f0ca5da359c4a526a1cc3e0d528 (patch) | |
| tree | e631dcfab8b2541c471a413dd6c071ba9a80e6c0 /onlineupdate | |
| parent | 5568023a716b945fa3e1398859ee9682b8f71a9a (diff) | |
tdf#130137 Replace remaining uses of WNT define checks with _WIN32
Change-Id: If95f1ea5a81de62eb4f725e5fcb30ccb8530062a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87372
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'onlineupdate')
| -rw-r--r-- | onlineupdate/source/update/updater/archivereader.cxx | 2 | ||||
| -rw-r--r-- | onlineupdate/source/update/updater/progressui_win.cxx | 2 | ||||
| -rw-r--r-- | onlineupdate/source/update/updater/updater.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/onlineupdate/source/update/updater/archivereader.cxx b/onlineupdate/source/update/updater/archivereader.cxx index bb548b919a0b..d669211437e9 100644 --- a/onlineupdate/source/update/updater/archivereader.cxx +++ b/onlineupdate/source/update/updater/archivereader.cxx @@ -33,7 +33,7 @@ #if defined(UNIX) # include <sys/types.h> -#elif defined(WNT) +#elif defined(_WIN32) # include <io.h> #endif diff --git a/onlineupdate/source/update/updater/progressui_win.cxx b/onlineupdate/source/update/updater/progressui_win.cxx index 12a80f3f7c91..0b8017823486 100644 --- a/onlineupdate/source/update/updater/progressui_win.cxx +++ b/onlineupdate/source/update/updater/progressui_win.cxx @@ -345,4 +345,4 @@ UpdateProgressUI(float progress) { sProgress = progress; // 32-bit writes are atomic } -#endif // WNT +#endif // _WIN32 diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx index 05515bef3d35..006e2ffe5a94 100644 --- a/onlineupdate/source/update/updater/updater.cxx +++ b/onlineupdate/source/update/updater/updater.cxx @@ -2158,7 +2158,7 @@ LaunchCallbackApp(const NS_tchar *workingDir, execv(argv[0], argv); #elif defined(MACOSX) LaunchChild(argc, (const char**)argv); -#elif defined(WNT) +#elif defined(_WIN32) // Do not allow the callback to run when running an update through the // service as session 0. The unelevated updater.exe will do the launching. if (!usingService) @@ -2365,7 +2365,7 @@ ProcessReplaceRequest() NS_tchar destDir[MAXPATHLEN]; NS_tsnprintf(destDir, sizeof(destDir)/sizeof(destDir[0]), NS_T("%s/Contents"), gInstallDirPath); -#elif defined(WNT) +#elif defined(_WIN32) // Windows preserves the case of the file/directory names. We use the // GetLongPathName API in order to get the correct case for the directory // name, so that if the user has used a different case when launching the @@ -3828,7 +3828,7 @@ int NS_main(int argc, NS_tchar **argv) "directory: " LOG_S, DELETE_DIR)); } } -#endif /* WNT */ +#endif /* _WIN32 */ #ifdef MACOSX |