From 6d721c7e10251ad8c89a461eed99d8cf2659c1df Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 17 Jan 2017 16:56:28 +0100 Subject: 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) --- src/evalfunc.c | 4 +--- src/os_unix.c | 4 ++-- src/version.c | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/evalfunc.c b/src/evalfunc.c index 768a0f1574..4b6bfaa137 100644 --- 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) +libcall_common(typval_T *argvars UNUSED, typval_T *rettv, int type) { #ifdef FEAT_LIBCALL char_u *string_in; diff --git a/src/os_unix.c b/src/os_unix.c index aa3c3e506d..48359d31ea 100644 --- 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, diff --git a/src/version.c b/src/version.c index d826cb31f3..50bcce0ba8 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 199, /**/ 198, /**/ -- cgit v1.2.3