commit 0a0f641b9841189ba4180758109d04d0a26e50e3
author Bram Moolenaar <Bram@vim.org> Tue Jul 19 21:30:13 2016 +0200
committer Bram Moolenaar <Bram@vim.org> Tue Jul 19 21:30:13 2016 +0200
tree 2c6a3332d35225369c9d6131a93906058c2e3da1
parent 68015bbd846181d49842d6ef60246c4195d20b89

patch 7.4.2074
Problem:    One more place using a dummy variable.
Solution:   Use offsetof(). (Ken Takata)

src/userfunc.c

diff --git a/src/userfunc.c b/src/userfunc.c
index 67d9c6d..ea15423 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -58,9 +58,8 @@
 #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]

src/version.c

diff --git a/src/version.c b/src/version.c
index fe86982..a5f33b1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2074,
+/**/
     2073,
 /**/
     2072,