mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-09-20 10:43:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

haze: fix duplicate-macro warnings

Browse Source 
haze was including both `<switch.h>` and `vapours/types.hpp` which both
define `R_SUCCEEDED` and `R_FAILED`, producing compiler warnings.

The intent is that `vapours/types.hpp` only gets included when targeting
not-Switch and/or not-EL0.  But the check didn't account for
Troposphère.  Fix that.
This commit is contained in:
comex 2025-08-08 14:13:04 -07:00 committed by Michael Scire
parent bc7a0fc11a
commit 4a51fffa97
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libvapours/include/vapours/includes.hpp
View File

@ -44,8 +44,9 @@
#include <bit> #include <bit>
#include <span> #include <span>
/* Stratosphere wants additional libstdc++ headers, others do not. */ /* Stratosphere/Troposphere want additional libstdc++ headers and libnx,
#ifdef ATMOSPHERE_IS_STRATOSPHERE * others do not. */
#if defined(ATMOSPHERE_IS_STRATOSPHERE) || defined(ATMOSPHERE_IS_TROPOSPHERE)
#include <memory> #include <memory>
#include <mutex> #include <mutex>
@ -71,7 +72,7 @@
/* Non-EL0 code can't include libnx. */ /* Non-EL0 code can't include libnx. */
#include "types.hpp" #include "types.hpp"
#endif /* ATMOSPHERE_IS_STRATOSPHERE */ #endif /* defined(ATMOSPHERE_IS_STRATOSPHERE) || defined(ATMOSPHERE_IS_TROPOSPHERE) */
/* Atmosphere meta. */ /* Atmosphere meta. */
#include <vapours/ams_version.h> #include <vapours/ams_version.h>