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 /jvmfwk/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 'jvmfwk/source')
| -rw-r--r-- | jvmfwk/source/elements.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/source/elements.hxx | 2 | ||||
| -rw-r--r-- | jvmfwk/source/framework.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/source/fwkutil.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index d84b52a61d8e..3e9f478c58ea 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -1060,7 +1060,7 @@ JavaInfo * MergedSettings::createJavaInfo() const { return m_javaInfo.makeJavaInfo(); } -#ifdef WNT +#ifdef _WIN32 bool MergedSettings::getJavaInfoAttrAutoSelect() const { return m_javaInfo.bAutoSelect; diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx index 7d457914ca29..21f48baac395 100644 --- a/jvmfwk/source/elements.hxx +++ b/jvmfwk/source/elements.hxx @@ -300,7 +300,7 @@ public: */ OString const & getJavaInfoAttrVendorUpdate() const { return m_javaInfo.sAttrVendorUpdate;} -#ifdef WNT +#ifdef _WIN32 /** returns the javaInfo@autoSelect attribute. Before calling this function loadFromSettings must be called. It uses the javaInfo@autoSelect attribute to determine diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index eb16743f33dc..41269431dd31 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -233,7 +233,7 @@ javaFrameworkError SAL_CALL jfw_startVM( if (aInfo == nullptr) return JFW_E_NO_SELECT; -#ifdef WNT +#ifdef _WIN32 //Because on Windows there is no system setting that we can use to determine //if Assistive Technology Tool support is needed, we ship a .reg file that the //user can use to create a registry setting. When the user forgets to set diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx index 53e74b2f363c..591a12a2c7ea 100644 --- a/jvmfwk/source/fwkutil.cxx +++ b/jvmfwk/source/fwkutil.cxx @@ -18,7 +18,7 @@ */ -#if defined WNT +#if defined(_WIN32) #if defined _MSC_VER #pragma warning(push, 1) #endif @@ -61,7 +61,7 @@ bool isAccessibilitySupportDesired() sValue == "1" ) return false; -#ifdef WNT +#ifdef _WIN32 bool retVal = false; HKEY hKey = 0; if (RegOpenKeyEx(HKEY_CURRENT_USER, |