changeset 10620:2198b53b9ffe v8.0.0199

patch 8.0.0199: compiler warnings for libcall commit https://github.com/vim/vim/commit/6d721c7e10251ad8c89a461eed99d8cf2659c1df Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jan 17 16:56:28 2017 +0100 patch 8.0.0199: compiler warnings for libcall Problem: Warning for an unused parameter when the libcall feature is disabled. Warning for a function type cast when compiling with -pedantic. Solution: Add UNUSED. Use a different type cast. (Damien Molinier)
author Christian Brabandt <cb@256bit.org>
date Tue, 17 Jan 2017 17:00:05 +0100
parents 3cc3825f1f53
children c1a829524ffe
files src/evalfunc.c src/os_unix.c src/version.c
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -6859,10 +6859,8 @@ f_len(typval_T *argvars, typval_T *rettv
     }
 }
 
-static void libcall_common(typval_T *argvars, typval_T *rettv, int type);
-
-    static void
-libcall_common(typval_T *argvars, typval_T *rettv, int type)
+    static void
+libcall_common(typval_T *argvars UNUSED, typval_T *rettv, int type)
 {
 #ifdef FEAT_LIBCALL
     char_u		*string_in;
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6918,7 +6918,7 @@ mch_libcall(
 	    if (argstring != NULL)
 	    {
 # if defined(USE_DLOPEN)
-		ProcAdd = (STRPROCSTR)dlsym(hinstLib, (const char *)funcname);
+		*(void **)(&ProcAdd) = dlsym(hinstLib, (const char *)funcname);
 		dlerr = (char *)dlerror();
 # else
 		if (shl_findsym(&hinstLib, (const char *)funcname,
@@ -6940,7 +6940,7 @@ mch_libcall(
 	    else
 	    {
 # if defined(USE_DLOPEN)
-		ProcAddI = (INTPROCSTR)dlsym(hinstLib, (const char *)funcname);
+		*(void **)(&ProcAddI) = dlsym(hinstLib, (const char *)funcname);
 		dlerr = (char *)dlerror();
 # else
 		if (shl_findsym(&hinstLib, (const char *)funcname,
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    199,
+/**/
     198,
 /**/
     197,