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 /xmlsecurity | |
| 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 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/resourcemanager.cxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/workben/signaturetest.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index 74f207e20d63..0de79b1623c5 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx @@ -128,7 +128,7 @@ #include <xmlsecurity/biginteger.hxx> // Cleanup windows header macro pollution. -#if defined(WNT) && defined(WINAPI) +#if defined(_WIN32) && defined(WINAPI) # include <postwin.h> # undef RGB #endif diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index c5a1e1382d7e..bf3979b81981 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -101,7 +101,7 @@ namespace XmlSec which we use to retrieve, for example, the subject name. If double quotes appear in the value then they are escaped with a double quote. This function removes the escape characters. */ -#ifdef WNT +#ifdef _WIN32 vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) { vector< pair<OUString, OUString> > retVal; diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx index 42ac155f0cab..d9987108c60d 100644 --- a/xmlsecurity/workben/signaturetest.cxx +++ b/xmlsecurity/workben/signaturetest.cxx @@ -243,7 +243,7 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : maEditSIGFileName.SetText( aNSSFolder + "demo-result.xml" ); maEditTokenName.SetText( aNSSFolder ); -#ifdef WNT +#ifdef _WIN32 maEditTokenName.SetText( OUString() ); maEditTokenName.Disable(); maCryptoCheckBox.Disable(); |