diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-17 16:56:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-17 16:56:28 +0100 |
| commit | 6d721c7e10251ad8c89a461eed99d8cf2659c1df (patch) | |
| tree | 0e9a92e1a0a96e9612d5408c340b25a21d9e303c | |
| parent | de318c5c35ed0d65fd2a07196cb8acd5ee6d9bf8 (diff) | |
| download | vim-git-6d721c7e10251ad8c89a461eed99d8cf2659c1df.tar.gz | |
patch 8.0.0199: compiler warnings for libcallv8.0.0199
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)
| -rw-r--r-- | src/evalfunc.c | 4 | ||||
| -rw-r--r-- | src/os_unix.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 768a0f157..4b6bfaa13 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 aa3c3e506..48359d31e 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 d826cb31f..50bcce0ba 100644 --- 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, |