aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil/filesystem.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-02-19 16:23:39 -0800
committerGuy Harris <guy@alum.mit.edu>2015-02-20 00:24:08 +0000
commit9423a13b2db427d15f6b3d11b73624fffc02608f (patch)
treea241140b23d189d8cb5466b72522dd6432a4ba96 /wsutil/filesystem.h
parentec6ec4994152f7d06d09544d61900f3ce1d55ced (diff)
Just have init_progfile_dir() take a void pointer.
dladdr() takes a void * as a code pointer; have init_progfile_dir() do so, and do the casting in the calls. We don't care about the signature of the function whose address we're passing, we just want to pass a pointer to *something* in the main program. Change-Id: I9372620a97b0eb53c2bb3c0c41a238b4408f3709 Reviewed-on: https://code.wireshark.org/review/7270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil/filesystem.h')
-rw-r--r--wsutil/filesystem.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/wsutil/filesystem.h b/wsutil/filesystem.h
index b8b1d3f433..03d2877e65 100644
--- a/wsutil/filesystem.h
+++ b/wsutil/filesystem.h
@@ -40,8 +40,7 @@ extern "C" {
* and save it for future use. Returns NULL on success, and a
* g_mallocated string containing an error on failure.
*/
-typedef int (*progfile_main_t)(int, char **);
-WS_DLL_PUBLIC char *init_progfile_dir(const char *arg0, progfile_main_t main_addr);
+WS_DLL_PUBLIC char *init_progfile_dir(const char *arg0, void *function_addr);
/*
* Get the directory in which the program resides.