From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 23 Jan 2016 18:54:30 +0000 (+0100)
Subject: patch 7.4.1155
X-Git-Tag: v7.4.1155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64922b9014765a41bb09e8612433a2a61918af6e;p=vim

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 a0cc6d017..c41e4a55a 100644
--- 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 85410e34b..b909693e5 100644
--- 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,
 /**/