mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2025-08-11 09:09:23 +02:00
haze: fix duplicate-macro warnings
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:
parent
8b8e4438e8
commit
4237f52ee2
@ -44,8 +44,9 @@
|
||||
#include <bit>
|
||||
#include <span>
|
||||
|
||||
/* Stratosphere wants additional libstdc++ headers, others do not. */
|
||||
#ifdef ATMOSPHERE_IS_STRATOSPHERE
|
||||
/* Stratosphere/Troposphere want additional libstdc++ headers and libnx,
|
||||
* others do not. */
|
||||
#if defined(ATMOSPHERE_IS_STRATOSPHERE) || defined(ATMOSPHERE_IS_TROPOSPHERE)
|
||||
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
@ -71,7 +72,7 @@
|
||||
/* Non-EL0 code can't include libnx. */
|
||||
#include "types.hpp"
|
||||
|
||||
#endif /* ATMOSPHERE_IS_STRATOSPHERE */
|
||||
#endif /* defined(ATMOSPHERE_IS_STRATOSPHERE) || defined(ATMOSPHERE_IS_TROPOSPHERE) */
|
||||
|
||||
/* Atmosphere meta. */
|
||||
#include <vapours/ams_version.h>
|
||||
|
@ -15,7 +15,9 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#define ATMOSPHERE_IS_TROPOSPHERE
|
||||
#define ATMOSPHERE_OS_HORIZON
|
||||
#define ATMOSPHERE_BOARD_NINTENDO_NX
|
||||
#define ATMOSPHERE_ARCH_ARM64
|
||||
#define ATMOSPHERE_ARCH_ARM_V8A
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user