summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-07-19 17:13:14 +0200
committerDavid Robillard <d@drobilla.net>2020-08-01 11:50:43 +0200
commitb453818f17a84c01d679088e5a377e244a231981 (patch)
tree66e0c71912fb975fb753905a7c9b1efa1f5a85a8 /src
parent381c4a77fe5864cd3aed3854b75acf2a52f6a74d (diff)
downloadingen-b453818f17a84c01d679088e5a377e244a231981.tar.gz
ingen-b453818f17a84c01d679088e5a377e244a231981.tar.bz2
ingen-b453818f17a84c01d679088e5a377e244a231981.zip
Make set_bundle_path_from_code take a function pointer
Diffstat (limited to 'src')
-rw-r--r--src/ingen/ingen.cpp3
-rw-r--r--src/runtime_paths.cpp4
2 files changed, 4 insertions, 3 deletions
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<void (*)()>(&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<FilePath> 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<void*>(function), &dli);
#ifdef BUNDLE
char bin_loc[PATH_MAX];