patch 7.4.1155

Problem:    Build with normal features fails.
Solution:   Always deinfe dict_lookup().

diff --git a/src/eval.c b/src/eval.c
index a0cc6d0170e982ee5b495f4ce7be1f50c228bcbd..c41e4a55a1ee147b5b9ab3f004088b6a94ed96fb 100644 (file)
--- 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
index 85410e34be4803b3e456c7ea1e96e26fb4d80bd9..b909693e5f13c280bfc38f8cadf599b08d5f8c5d 100644 (file)
--- 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,
 /**/