diff --git a/src/core/kernel/init/CxbxKrnl.cpp b/src/core/kernel/init/CxbxKrnl.cpp index 2f3f646fe..3889de9ae 100644 --- a/src/core/kernel/init/CxbxKrnl.cpp +++ b/src/core/kernel/init/CxbxKrnl.cpp @@ -1005,7 +1005,7 @@ static bool CxbxrKrnlPrepareXbeMap() } /*! initialize emulation */ -static __declspec(noreturn) void CxbxrKrnlInit( +[[noreturn]] static void CxbxrKrnlInit( void* pTLSData, Xbe::TLS* pTLS, Xbe::LibraryVersion* LibraryVersion, @@ -1244,7 +1244,7 @@ static void CxbxrKrnlInitHacks() g_SkipRdtscPatching = !!HackEnabled; } -static __declspec(noreturn) void CxbxrKrnlInit +[[noreturn]] static void CxbxrKrnlInit ( void *pTLSData, Xbe::TLS *pTLS, @@ -1537,7 +1537,7 @@ static __declspec(noreturn) void CxbxrKrnlInit } };*/ -__declspec(noreturn) void CxbxrKrnlAbortEx(CXBXR_MODULE cxbxr_module, const char *szErrorMessage, ...) +[[noreturn]] void CxbxrKrnlAbortEx(CXBXR_MODULE cxbxr_module, const char *szErrorMessage, ...) { g_bEmuException = true; @@ -1759,7 +1759,7 @@ void CxbxPrintUEMInfo(ULONG ErrorCode) } } -__declspec(noreturn) void CxbxKrnlTerminateThread() +[[noreturn]] void CxbxKrnlTerminateThread() { TerminateThread(GetCurrentThread(), 0); } diff --git a/src/core/kernel/init/CxbxKrnl.h b/src/core/kernel/init/CxbxKrnl.h index c726952d1..f22a61fa5 100644 --- a/src/core/kernel/init/CxbxKrnl.h +++ b/src/core/kernel/init/CxbxKrnl.h @@ -147,7 +147,7 @@ bool HandleFirstLaunch(); void CxbxKrnlEmulate(unsigned int system, blocks_reserved_t blocks_reserved); /*! cleanup emulation */ -__declspec(noreturn) void CxbxrKrnlAbortEx(CXBXR_MODULE cxbxr_module, const char *szErrorMessage, ...); +[[noreturn]] void CxbxrKrnlAbortEx(CXBXR_MODULE cxbxr_module, const char *szErrorMessage, ...); #define CxbxrKrnlAbort(fmt, ...) CxbxrKrnlAbortEx(LOG_PREFIX, fmt, ##__VA_ARGS__) @@ -170,7 +170,7 @@ void CxbxKrnlPrintUEM(ULONG ErrorCode); void CxbxPrintUEMInfo(ULONG ErrorCode); /*! terminate the calling thread */ -__declspec(noreturn) void CxbxKrnlTerminateThread(); +[[noreturn]] void CxbxKrnlTerminateThread(); /*! kernel panic (trap for unimplemented kernel functions) */ void CxbxKrnlPanic();