aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-04-26 10:39:24 +0300
committerEli Zaretskii2019-04-26 10:39:24 +0300
commit83cdf7bf15d8f80fdc94e2de2ba96323f1d30101 (patch)
tree39d912041af6d4b2836c137c2fa44fdc2e944b31 /src
parenta241e45b5a3a5664d9087069e8ef8e0f4ff0df7c (diff)
downloademacs-83cdf7bf15d8f80fdc94e2de2ba96323f1d30101.tar.gz
emacs-83cdf7bf15d8f80fdc94e2de2ba96323f1d30101.zip
Avoid compiler warning in dynlib.c
* src/dynlib.c (dynlib_addr) [WINDOWSNT]: Rename the first argument to be consistent with other platforms. Cast it to 'void *' to avoid compiler warning as result of changing the function's signature as part of the last recent change in dynlib.c.
Diffstat (limited to 'src')
-rw-r--r--src/dynlib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dynlib.c b/src/dynlib.c
index 9c1bf4a82af..8c25b75537f 100644
--- a/src/dynlib.c
+++ b/src/dynlib.c
@@ -123,7 +123,7 @@ dynlib_sym (dynlib_handle_ptr h, const char *sym)
123} 123}
124 124
125void 125void
126dynlib_addr (void (*addr) (void), const char **fname, const char **symname) 126dynlib_addr (void (*funcptr) (void), const char **fname, const char **symname)
127{ 127{
128 static char dll_filename[MAX_UTF8_PATH]; 128 static char dll_filename[MAX_UTF8_PATH];
129 static GetModuleHandleExA_Proc s_pfn_Get_Module_HandleExA = NULL; 129 static GetModuleHandleExA_Proc s_pfn_Get_Module_HandleExA = NULL;
@@ -132,6 +132,7 @@ dynlib_addr (void (*addr) (void), const char **fname, const char **symname)
132 HMODULE hm_dll = NULL; 132 HMODULE hm_dll = NULL;
133 wchar_t mfn_w[MAX_PATH]; 133 wchar_t mfn_w[MAX_PATH];
134 char mfn_a[MAX_PATH]; 134 char mfn_a[MAX_PATH];
135 void *addr = (void *) funcptr;
135 136
136 /* Step 1: Find the handle of the module where ADDR lives. */ 137 /* Step 1: Find the handle of the module where ADDR lives. */
137 if (os_subtype == OS_9X 138 if (os_subtype == OS_9X