From 4e6118c919bd1f3cd864526345c0b9b7abcbb2e4 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 14 Jun 2023 20:30:02 +0200 Subject: Core/Misc: Replace std::abort with our ABORT macro * libmysql is not a well behaved library on windows, it installs its own SIGABRT handler every time a new connection is opened, overriding our own (cherry picked from commit 09dea76fb5ede974d6765d40985b033db3fba6a3) --- src/server/game/Scripting/ScriptReloadMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/Scripting/ScriptReloadMgr.cpp') diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp index 47c44358da1..501540ae952 100644 --- a/src/server/game/Scripting/ScriptReloadMgr.cpp +++ b/src/server/game/Scripting/ScriptReloadMgr.cpp @@ -1510,7 +1510,7 @@ void LibraryUpdateListener::handleFileAction(efsw::WatchID watchid, std::string reloader->QueueSharedLibraryChanged(path); break; default: - WPAbort(); + ABORT(); break; } }); @@ -1600,7 +1600,7 @@ void SourceUpdateListener::handleFileAction(efsw::WatchID watchid, std::string c reloader->QueueModifySourceFile(script_module_name_, path); break; default: - WPAbort(); + ABORT(); break; } }); -- cgit v1.2.3