diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 14:14:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-17 11:33:57 +0000 |
| commit | 2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch) | |
| tree | 1f335918a854319df9269329d165a91d711d2108 /configmgr/source | |
| parent | d6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff) | |
use consistent #define checks for the Windows platform
stage 2 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
In this stage we focus on replacing usage of the WIN macro
Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84
Reviewed-on: https://gerrit.libreoffice.org/22393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'configmgr/source')
| -rw-r--r-- | configmgr/source/components.cxx | 4 | ||||
| -rw-r--r-- | configmgr/source/writemodfile.cxx | 2 | ||||
| -rw-r--r-- | configmgr/source/writemodfile.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index b1b4b725c579..3f94a8d39917 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -69,7 +69,7 @@ #include <dconf.hxx> #endif -#if defined WNT +#if defined(_WIN32) #include "winreg.hxx" #endif @@ -546,7 +546,7 @@ Components::Components( } ++layer; //TODO: overflow #endif -#if defined WNT +#if defined(_WIN32) } else if (type == "winreg") { WinRegType eType; if (url == "LOCAL_MACHINE" || url.isEmpty()/*backwards comp.*/) { diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx index 0824bae736a7..d04818ecae88 100644 --- a/configmgr/source/writemodfile.cxx +++ b/configmgr/source/writemodfile.cxx @@ -93,7 +93,7 @@ TempFile::~TempFile() { } } -#ifdef WNT +#ifdef _WIN32 oslFileError TempFile::closeWithoutUnlink() { flush(); oslFileError e = osl_closeFile(handle); diff --git a/configmgr/source/writemodfile.hxx b/configmgr/source/writemodfile.hxx index caa9eee8b69a..d1a9348a0490 100644 --- a/configmgr/source/writemodfile.hxx +++ b/configmgr/source/writemodfile.hxx @@ -38,7 +38,7 @@ struct TempFile { ~TempFile(); void closeAndRename(const OUString &url); oslFileError flush(); -#ifdef WNT +#ifdef _WIN32 oslFileError closeWithoutUnlink(); #endif void writeString(char const *begin, sal_Int32 length); |