summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-14 22:34:34 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-14 22:34:34 +0200
commit7399895520b3248d5751c8dba8b9a4f27522d2dd (patch)
tree17bbef14bbe07eb7a1e363220fb2d1435c5f0316
parent480778b805bd8bdc5d657560230e9c50feda1d0f (diff)
downloadvim-git-7399895520b3248d5751c8dba8b9a4f27522d2dd.tar.gz
patch 7.4.2037v7.4.2037
Problem: Small build fails. Solution: Adjust #ifdefs.
-rw-r--r--src/hashtab.c6
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/hashtab.c b/src/hashtab.c
index f9c7c2799..84d9b9a5a 100644
--- a/src/hashtab.c
+++ b/src/hashtab.c
@@ -29,8 +29,6 @@
#include "vim.h"
-#if defined(FEAT_EVAL) || defined(FEAT_SYN_HL) || defined(PROTO)
-
#if 0
# define HT_DEBUG /* extra checks for table consistency and statistics */
@@ -72,6 +70,7 @@ hash_init(hashtab_T *ht)
ht->ht_mask = HT_INIT_SIZE - 1;
}
+#if defined(FEAT_EVAL) || defined(FEAT_SYN_HL) || defined(PROTO)
/*
* Free the array of a hash table. Does not free the items it contains!
* If "ht" is not freed then you should call hash_init() next!
@@ -105,6 +104,7 @@ hash_clear_all(hashtab_T *ht, int off)
}
hash_clear(ht);
}
+#endif
/*
* Find "key" in hashtable "ht". "key" must not be NULL.
@@ -478,5 +478,3 @@ hash_hash(char_u *key)
return hash;
}
-
-#endif
diff --git a/src/version.c b/src/version.c
index 23a5993ad..45aada0f6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2037,
+/**/
2036,
/**/
2035,