diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-01-23 19:54:30 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-01-23 19:54:30 +0100 |
commit | 64922b9014765a41bb09e8612433a2a61918af6e (patch) | |
tree | 0c6a2f97d496054d42e8af2d4e57116a825a94ba | |
parent | 520e1e41f35b063ede63b41738c82d6636e78c34 (diff) | |
download | vim-git-64922b9014765a41bb09e8612433a2a61918af6e.tar.gz |
patch 7.4.1155v7.4.1155
Problem: Build with normal features fails.
Solution: Always deinfe dict_lookup().
-rw-r--r-- | src/eval.c | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 3 deletions
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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1155, +/**/ 1154, /**/ 1153, |