changeset 9593:8dced5ab4615 v7.4.2074

commit https://github.com/vim/vim/commit/0a0f641b9841189ba4180758109d04d0a26e50e3 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jul 19 21:30:13 2016 +0200 patch 7.4.2074 Problem: One more place using a dummy variable. Solution: Use offsetof(). (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Tue, 19 Jul 2016 21:45:06 +0200
parents 3e42d947b5ad
children 054a7764b8ea
files src/userfunc.c src/version.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -58,9 +58,8 @@ struct ufunc
 #define FC_DICT	    4		/* Dict function, uses "self" */
 
 /* From user function to hashitem and back. */
-static ufunc_T dumuf;
 #define UF2HIKEY(fp) ((fp)->uf_name)
-#define HIKEY2UF(p)  ((ufunc_T *)(p - (dumuf.uf_name - (char_u *)&dumuf)))
+#define HIKEY2UF(p)  ((ufunc_T *)(p - offsetof(ufunc_T, uf_name)))
 #define HI2UF(hi)     HIKEY2UF((hi)->hi_key)
 
 #define FUNCARG(fp, j)	((char_u **)(fp->uf_args.ga_data))[j]
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2074,
+/**/
     2073,
 /**/
     2072,