Skip to content

Commit 8747689

Browse files
authored
gcc 13 fixes (#610)
1 parent d219884 commit 8747689

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

nx/include/switch/services/btdrv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,7 @@ Result btdrvUnregisterGattNotification(u32 connection_handle, bool primary_servi
12701270
* @param[in] size Output buffer size.
12711271
* @oaram[out] type Output BleEventType.
12721272
*/
1273-
Result btdrvGetLeHidEventInfo(void* buffer, size_t size, u32 *type);
1273+
Result btdrvGetLeHidEventInfo(void* buffer, size_t size, BtdrvBleEventType *type);
12741274

12751275
/**
12761276
* @brief RegisterBleHidEvent

nx/include/switch/sf/cmif.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ typedef struct CmifResponse {
9191
Handle* move_handles;
9292
} CmifResponse;
9393

94-
NX_CONSTEXPR void* cmifGetAlignedDataStart(u32* data_words, void* base)
94+
NX_INLINE void* cmifGetAlignedDataStart(u32* data_words, void* base)
9595
{
9696
intptr_t data_start = ((u8*)data_words - (u8*)base + 15) &~ 15;
9797
return (u8*)base + data_start;
9898
}
9999

100-
NX_CONSTEXPR CmifRequest cmifMakeRequest(void* base, CmifRequestFormat fmt)
100+
NX_INLINE CmifRequest cmifMakeRequest(void* base, CmifRequestFormat fmt)
101101
{
102102
// First of all, we need to figure out what size we need.
103103
u32 actual_size = 16;
@@ -156,7 +156,7 @@ NX_CONSTEXPR CmifRequest cmifMakeRequest(void* base, CmifRequestFormat fmt)
156156
return req;
157157
}
158158

159-
NX_CONSTEXPR void* cmifMakeControlRequest(void* base, u32 request_id, u32 size)
159+
NX_INLINE void* cmifMakeControlRequest(void* base, u32 request_id, u32 size)
160160
{
161161
u32 actual_size = 16 + sizeof(CmifInHeader) + size;
162162
HipcRequest hipc = hipcMakeRequestInline(base,
@@ -173,7 +173,7 @@ NX_CONSTEXPR void* cmifMakeControlRequest(void* base, u32 request_id, u32 size)
173173
return hdr+1;
174174
}
175175

176-
NX_CONSTEXPR void cmifMakeCloseRequest(void* base, u32 object_id)
176+
NX_INLINE void cmifMakeCloseRequest(void* base, u32 object_id)
177177
{
178178
if (object_id) {
179179
HipcRequest hipc = hipcMakeRequestInline(base,
@@ -257,7 +257,7 @@ NX_CONSTEXPR void cmifRequestHandle(CmifRequest* req, Handle handle)
257257
*req->hipc.copy_handles++ = handle;
258258
}
259259

260-
NX_CONSTEXPR Result cmifParseResponse(CmifResponse* res, void* base, bool is_domain, u32 size)
260+
NX_INLINE Result cmifParseResponse(CmifResponse* res, void* base, bool is_domain, u32 size)
261261
{
262262
HipcResponse hipc = hipcParseResponse(base);
263263
void* start = cmifGetAlignedDataStart(hipc.data_words, base);

nx/source/applets/web.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ Result webConfigSetWebAudio(WebCommonConfig* config, bool flag) {
582582
return _webConfigSetFlag(config, WebArgType_WebAudio, flag);
583583
}
584584

585-
Result webConfigSetFooterFixedKind(WebCommonConfig* config, u32 kind) {
585+
Result webConfigSetFooterFixedKind(WebCommonConfig* config, WebFooterFixedKind kind) {
586586
WebShimKind shim = _webGetShimKind(config);
587587
if (shim != WebShimKind_Offline && shim != WebShimKind_Web) return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
588588
if (hosversionBefore(5,0,0)) return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);

nx/source/services/applet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1722,7 +1722,7 @@ bool appletHolderCheckFinished(AppletHolder *h) {
17221722
return R_SUCCEEDED(eventWait(&h->StateChangedEvent, 0));
17231723
}
17241724

1725-
u32 appletHolderGetExitReason(AppletHolder *h) {
1725+
LibAppletExitReason appletHolderGetExitReason(AppletHolder *h) {
17261726
return h->exitreason;
17271727
}
17281728

0 commit comments

Comments
 (0)