patch 7.4.1155

brammool · brammool · commit 64922b901476 · 2016-01-23T19:54:30.000+01:00
Problem:    Build with normal features fails.
Solution:   Always deinfe dict_lookup().
diff --git a/src/eval.c b/src/eval.c
@@ -6140,8 +6140,6 @@ list_equal(l1, l2, ic, recursive)
     return item1 == NULL && item2 == NULL;
 }
 
-#if defined(FEAT_RUBY) || defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) \
-	|| defined(FEAT_MZSCHEME) || defined(FEAT_LUA) || defined(PROTO)
 /*
  * Return the dictitem that an entry in a hashtable points to.
  */
@@ -6151,7 +6149,6 @@ dict_lookup(hi)
 {
     return HI2DI(hi);
 }
-#endif
 
 /*
  * Return TRUE when two dictionaries have exactly the same key/values.
diff --git a/src/version.c b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1155,
 /**/
     1154,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -6140,8 +6140,6 @@ list_equal(l1, l2, ic, recursive)`
`6140`	`6140`	`return item1 == NULL && item2 == NULL;`
`6141`	`6141`	`}`
`6142`	`6142`
`6143`		`-#if defined(FEAT_RUBY) \|\| defined(FEAT_PYTHON) \|\| defined(FEAT_PYTHON3) \`
`6144`		`- \|\| defined(FEAT_MZSCHEME) \|\| defined(FEAT_LUA) \|\| defined(PROTO)`
`6145`	`6143`	`/*`
`6146`	`6144`	`* Return the dictitem that an entry in a hashtable points to.`
`6147`	`6145`	`*/`
`@@ -6151,7 +6149,6 @@ dict_lookup(hi)`
`6151`	`6149`	`{`
`6152`	`6150`	`return HI2DI(hi);`
`6153`	`6151`	`}`
`6154`		`-#endif`
`6155`	`6152`
`6156`	`6153`	`/*`
`6157`	`6154`	`* Return TRUE when two dictionaries have exactly the same key/values.`