From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 26 Apr 2019 07:39:24 +0000 (+0300)
Subject: Avoid compiler warning in dynlib.c
X-Git-Tag: emacs-27.0.90~3079
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=83cdf7bf15d8f80fdc94e2de2ba96323f1d30101;p=emacs.git

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.
---

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)
 }
 
 void
-dynlib_addr (void (*addr) (void), const char **fname, const char **symname)
+dynlib_addr (void (*funcptr) (void), const char **fname, const char **symname)
 {
   static char dll_filename[MAX_UTF8_PATH];
   static GetModuleHandleExA_Proc s_pfn_Get_Module_HandleExA = NULL;
@@ -132,6 +132,7 @@ dynlib_addr (void (*addr) (void), const char **fname, const char **symname)
   HMODULE hm_dll = NULL;
   wchar_t mfn_w[MAX_PATH];
   char mfn_a[MAX_PATH];
+  void *addr = (void *) funcptr;
 
   /* Step 1: Find the handle of the module where ADDR lives.  */
   if (os_subtype == OS_9X