From b453818f17a84c01d679088e5a377e244a231981 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 19 Jul 2020 17:13:14 +0200 Subject: Make set_bundle_path_from_code take a function pointer --- src/ingen/ingen.cpp | 3 ++- src/runtime_paths.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp index 80f7ab36..fd9a3578 100644 --- a/src/ingen/ingen.cpp +++ b/src/ingen/ingen.cpp @@ -90,7 +90,8 @@ print_version() int main(int argc, char** argv) { - ingen::set_bundle_path_from_code((void*)&print_version); + ingen::set_bundle_path_from_code( + reinterpret_cast(&print_version)); // Create world try { diff --git a/src/runtime_paths.cpp b/src/runtime_paths.cpp index db3ccd3f..38eb681f 100644 --- a/src/runtime_paths.cpp +++ b/src/runtime_paths.cpp @@ -65,10 +65,10 @@ parse_search_path(const char* search_path, std::vector defaults) * Passing a function defined in a module etc. will not work! */ void -set_bundle_path_from_code(void* function) +set_bundle_path_from_code(void (*function)()) { Dl_info dli; - dladdr(function, &dli); + dladdr(reinterpret_cast(function), &dli); #ifdef BUNDLE char bin_loc[PATH_MAX]; -- cgit v1.2.1