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 /shell | |
| 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 'shell')
| -rw-r--r-- | shell/source/backends/localebe/localebackend.cxx | 8 | ||||
| -rw-r--r-- | shell/source/tools/lngconvex/lngconvex.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 9aea14ea2419..07729f0afa05 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -25,7 +25,7 @@ #include <stdio.h> -#ifdef WNT +#ifdef _WIN32 #if defined _MSC_VER #pragma warning(push, 1) #endif @@ -222,7 +222,7 @@ LocaleBackend* LocaleBackend::createInstance() OUString LocaleBackend::getLocale() { -#if defined WNT +#if defined(_WIN32) return ImplGetLocale( GetUserDefaultLCID() ); #elif defined (MACOSX) return ImplGetLocale("AppleLocale"); @@ -234,7 +234,7 @@ OUString LocaleBackend::getLocale() OUString LocaleBackend::getUILocale() { -#if defined WNT +#if defined(_WIN32) return ImplGetLocale( MAKELCID(GetUserDefaultUILanguage(), SORT_DEFAULT) ); #elif defined(MACOSX) return ImplGetLocale("AppleLanguages"); @@ -247,7 +247,7 @@ OUString LocaleBackend::getUILocale() OUString LocaleBackend::getSystemLocale() { // note: the implementation differs from getLocale() only on Windows -#if defined WNT +#if defined(_WIN32) return ImplGetLocale( GetSystemDefaultLCID() ); #else return getLocale(); diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index 395a283e29e9..75af049601a4 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -22,7 +22,7 @@ #endif -#ifdef WNT +#ifdef _WIN32 #include <prewin.h> #include <postwin.h> #else @@ -54,7 +54,7 @@ typedef unsigned short WORD; #include <algorithm> #include <string> -#ifndef WNT +#ifndef _WIN32 #include <cstring> #endif @@ -438,7 +438,7 @@ void start_language_section( ( subLangID == SUBLANG_SPANISH ) ) subLangID = SUBLANG_NEUTRAL; -#ifdef WNT +#ifdef _WIN32 _itoa(primLangID, buff, 16); #else sprintf(buff, "%x", primLangID); @@ -447,7 +447,7 @@ void start_language_section( lang_section += std::string(" , "); -#ifdef WNT +#ifdef _WIN32 _itoa(subLangID, buff, 16); #else sprintf(buff, "%x", subLangID); |