Use _WIN32
instead of WIN32
to detect Windows
`WIN32` is not defined when building a 64-bit executable on Windows with Clang. `_WIN32` is the more appropriate option here. http://web.archive.org/web/20191012035921/http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_system contains a handy table/matrix of the options and why this is best.
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
#include <glib.h>
|
||||
#include <iostream>
|
||||
#include <utility>
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
#include <winnls.h>
|
||||
#endif
|
||||
@@ -315,7 +315,7 @@ const TranslationMetadata *MultiLangMgr::getMetadata(const Glib::ustring &fname)
|
||||
|
||||
bool MultiLangMgr::isOSLanguageDetectSupported ()
|
||||
{
|
||||
#if defined (WIN32) || defined (__linux__) || defined (__APPLE__)
|
||||
#if defined (_WIN32) || defined (__linux__) || defined (__APPLE__)
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
@@ -326,7 +326,7 @@ Glib::ustring MultiLangMgr::getOSUserLanguage ()
|
||||
{
|
||||
Glib::ustring langName ("default");
|
||||
|
||||
#if defined (WIN32)
|
||||
#if defined (_WIN32)
|
||||
|
||||
const LCID localeID = GetUserDefaultLCID ();
|
||||
TCHAR localeName[18];
|
||||
|
Reference in New Issue
Block a user