From 490bad990a58a260b8e88f05db7dd3e352e82009 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed, 11 May 2022 10:32:02 -0700 Subject: [PATCH] crashpad: update for new OS macros --- app/common/crashpadinterface.cpp | 2 +- app/common/crashpadutils.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/common/crashpadinterface.cpp b/app/common/crashpadinterface.cpp index 70c30076f..d9b6fcb86 100644 --- a/app/common/crashpadinterface.cpp +++ b/app/common/crashpadinterface.cpp @@ -32,7 +32,7 @@ #include "crashpadutils.h" #include "filefunctions.h" -#ifdef OS_WIN +#ifdef BUILDFLAG(IS_WIN) #include #endif diff --git a/app/common/crashpadutils.h b/app/common/crashpadutils.h index 88b332a76..8b0e3e6d7 100644 --- a/app/common/crashpadutils.h +++ b/app/common/crashpadutils.h @@ -24,17 +24,17 @@ #include // Copied from base::FilePath to match its macro -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) // On most platforms, native pathnames are char arrays, and the encoding // may or may not be specified. On Mac OS X, native pathnames are encoded // in UTF-8. #define QSTRING_TO_BASE_STRING(x) x.toStdString() #define BASE_STRING_TO_QSTRING(x) QString::fromStdString(x) -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) // On Windows, for Unicode-aware applications, native pathnames are wchar_t // arrays encoded in UTF-16. #define QSTRING_TO_BASE_STRING(x) x.toStdWString() #define BASE_STRING_TO_QSTRING(x) QString::fromStdWString(x) -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) #endif // CRASHPADUTILS_H