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 /connectivity | |
| parent | ForceReposition is unused (diff) | |
| download | core-2087484c65a3d5e75a9e8ad116d11a4e13366219.tar.gz core-2087484c65a3d5e75a9e8ad116d11a4e13366219.zip | |
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 'connectivity')
4 files changed, 4 insertions, 4 deletions
diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx index 5e7ce61533f4..1e7ad135287a 100644 --- a/connectivity/inc/pch/precompiled_ado.hxx +++ b/connectivity/inc/pch/precompiled_ado.hxx @@ -70,7 +70,7 @@ #include <connectivity/sdbcx/IRefreshable.hxx> // Cleanup windows header macro pollution. -#ifdef WNT +#ifdef _WIN32 # include <postwin.h> # undef RGB #endif diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 4025aba6a7db..cf6ad3ff12a0 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -119,7 +119,7 @@ namespace connectivity OUString StorageContainer::removeOldURLPrefix(const OUString& _sURL) { OUString sRet = _sURL; -#if defined(WNT) +#if defined(_WIN32) sal_Int32 nIndex = sRet.lastIndexOf('\\'); #else sal_Int32 nIndex = sRet.lastIndexOf('/'); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index 29f4e19bd679..24492f1b36e1 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -25,7 +25,7 @@ #include <string.h> #endif // End UNIX -#ifdef WNT +#ifdef _WIN32 #include <windows.h> #include <stdlib.h> #include <shlobj.h> diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx index 84583c4ea73f..252570155159 100644 --- a/connectivity/source/drivers/odbc/OFunctions.cxx +++ b/connectivity/source/drivers/odbc/OFunctions.cxx @@ -90,7 +90,7 @@ bool LoadLibrary_ODBC3(OUString &_rPath) if (bLoaded) return true; -#ifdef WNT +#ifdef _WIN32 _rPath = "ODBC32.DLL"; #endif #ifdef UNX |