From 17de88e839282d440f74bfe34d3e0a8c2f312c6c Mon Sep 17 00:00:00 2001 From: lethosor Date: Tue, 7 Sep 2021 11:58:44 -0400 Subject: [PATCH] Fix some warnings on macOS --- library/Hooks-darwin.cpp | 2 -- library/Hooks-linux.cpp | 5 +---- library/Process-darwin.cpp | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/library/Hooks-darwin.cpp b/library/Hooks-darwin.cpp index 22e7cc2e9..723d97970 100644 --- a/library/Hooks-darwin.cpp +++ b/library/Hooks-darwin.cpp @@ -314,8 +314,6 @@ DFhackCExport int DFH_SDL_Init(uint32_t flags) // prevent any subprocesses from trying to load libdfhack.dylib setenv("DYLD_INSERT_LIBRARIES", "", 1); - DFHack::Core & c = DFHack::Core::getInstance(); - int ret = SDL_Init(flags); return ret; } diff --git a/library/Hooks-linux.cpp b/library/Hooks-linux.cpp index 8291bf899..cb8ba20db 100644 --- a/library/Hooks-linux.cpp +++ b/library/Hooks-linux.cpp @@ -139,10 +139,7 @@ DFhackCExport int SDL_Init(uint32_t flags) fprintf(stderr,"dfhack: something went horribly wrong\n"); exit(1); } - /* - DFHack::Core & c = DFHack::Core::getInstance(); - c.Init(); - */ + int ret = _SDL_Init(flags); return ret; } diff --git a/library/Process-darwin.cpp b/library/Process-darwin.cpp index 4e1abc108..70598e18f 100644 --- a/library/Process-darwin.cpp +++ b/library/Process-darwin.cpp @@ -50,8 +50,6 @@ using namespace DFHack; Process::Process(const VersionInfoFactory& known_versions) : identified(false), my_pe(0) { - int target_result; - char path[1024]; char *real_path; uint32_t size = sizeof(path);