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 /svl | |
| 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 'svl')
| -rw-r--r-- | svl/qa/unit/svl.cxx | 2 | ||||
| -rw-r--r-- | svl/qa/unit/test_URIHelper.cxx | 2 | ||||
| -rw-r--r-- | svl/source/config/languageoptions.cxx | 4 | ||||
| -rw-r--r-- | svl/source/svdde/ddedata.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index e10221132dcf..53d05cba1598 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifdef WNT +#ifdef _WIN32 # undef ERROR #endif diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 50b239943594..1a8e029519ef 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -256,7 +256,7 @@ void Test::testNormalizedMakeRelative() { "nonex3/nonex4#fragmentB" }, { "file:///usr/nonex1/nonex2", "file:///usr/nonex3", "../nonex3" }, { "file:///c:/windows/nonex1", "file:///c:/nonex2", "../nonex2" }, -#if defined WNT +#if defined(_WIN32) { "file:///c:/nonex1/nonex2", "file:///C:/nonex1/nonex3/nonex4", "nonex3/nonex4" } #endif diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index 4d1990cce6d2..92cbd67d3992 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -28,7 +28,7 @@ #include <com/sun/star/i18n/ScriptType.hpp> #include <unotools/syslocale.hxx> -#ifdef WNT +#ifdef _WIN32 #include <windows.h> #endif @@ -224,7 +224,7 @@ LanguageType SvtSystemLanguageOptions::GetWin16SystemLanguage() const bool SvtSystemLanguageOptions::isKeyboardLayoutTypeInstalled(sal_Int16 scriptType) const { bool isInstalled = false; -#ifdef WNT +#ifdef _WIN32 int nLayouts = GetKeyboardLayoutList(0, NULL); if (nLayouts > 0) { diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx index 9b338b82d82d..ce0773391ba8 100644 --- a/svl/source/svdde/ddedata.cxx +++ b/svl/source/svdde/ddedata.cxx @@ -125,7 +125,7 @@ sal_uLong DdeData::GetExternalFormat(SotClipboardFormatId nFmt) return CF_METAFILEPICT; default: { -#if defined(WNT) +#if defined(_WIN32) OUString aName( SotExchange::GetFormatName( nFmt ) ); if( !aName.isEmpty() ) return RegisterClipboardFormat( reinterpret_cast<LPCWSTR>(aName.getStr()) ); @@ -146,7 +146,7 @@ SotClipboardFormatId DdeData::GetInternalFormat(sal_uLong nFmt) case CF_METAFILEPICT: return SotClipboardFormatId::GDIMETAFILE; default: -#if defined(WNT) +#if defined(_WIN32) if( nFmt >= CF_MAX ) { TCHAR szName[ 256 ]; |