diff --git a/nx/include/switch/services/audren.h b/nx/include/switch/services/audren.h index 8a2d3215..67738728 100644 --- a/nx/include/switch/services/audren.h +++ b/nx/include/switch/services/audren.h @@ -9,12 +9,6 @@ #include "../audio/audio.h" #include "../services/sm.h" -#if __cplusplus >= 201402L -#define AUDREN_CONSTEXPR constexpr -#else -#define AUDREN_CONSTEXPR static inline -#endif - #define AUDREN_TIMER_FREQ_HZ 200.0f #define AUDREN_TIMER_PERIOD_MS 5.0f #define AUDREN_SAMPLES_PER_FRAME_32KHZ 160 @@ -287,12 +281,12 @@ static inline u32 audrenGetRevision(void) return g_audrenRevision; } -AUDREN_CONSTEXPR int audrenGetMemPoolCount(const AudioRendererConfig* config) +NX_CONSTEXPR int audrenGetMemPoolCount(const AudioRendererConfig* config) { return config->num_effects + 4 * config->num_voices; } -AUDREN_CONSTEXPR size_t audrenGetInputParamSize(const AudioRendererConfig* config) +NX_CONSTEXPR size_t audrenGetInputParamSize(const AudioRendererConfig* config) { size_t size = 0; size += sizeof(AudioRendererUpdateDataHeader); @@ -307,7 +301,7 @@ AUDREN_CONSTEXPR size_t audrenGetInputParamSize(const AudioRendererConfig* confi return size; } -AUDREN_CONSTEXPR size_t audrenGetOutputParamSize(const AudioRendererConfig* config) +NX_CONSTEXPR size_t audrenGetOutputParamSize(const AudioRendererConfig* config) { size_t size = 0; size += sizeof(AudioRendererUpdateDataHeader); diff --git a/nx/include/switch/types.h b/nx/include/switch/types.h index 5de2188f..d28e9b9e 100644 --- a/nx/include/switch/types.h +++ b/nx/include/switch/types.h @@ -77,5 +77,15 @@ typedef void (*VoidFn)(void); ///< Function without arguments nor return v #endif #endif +/// Flags a function as (always) inline. +#define NX_INLINE __attribute__((always_inline)) static inline + +/// Flags a function as constexpr in C++14 and above; or as (always) inline otherwise. +#if __cplusplus >= 201402L +#define NX_CONSTEXPR NX_INLINE constexpr +#else +#define NX_CONSTEXPR NX_INLINE +#endif + /// Invalid handle. #define INVALID_HANDLE ((Handle) 0)