diff options
| author | Bram Moolenaar <bram@vim.org> | 2015-08-13 23:28:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2015-08-13 23:28:43 +0200 |
| commit | ea0f87e7ebf999b537351f87e342a8e121ee98e8 (patch) | |
| tree | d445b08bea644f03208db16a818e3addd44a23f2 | |
| parent | 3dc899a92a0e38d6ed368b831904b25dd9648faa (diff) | |
| download | vim-ea0f87e7ebf999b537351f87e342a8e121ee98e8.tar.gz | |
Problem: Compiler warnings and errors.
Solution: Make it build properly without the multi-byte feature.
| -rw-r--r-- | src/eval.c | 4 | ||||
| -rw-r--r-- | src/search.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -17056,8 +17056,8 @@ f_setcharsearch(argvars, rettv) } else #endif - set_last_csearch(mb_ptr2char(csearch), - csearch, mb_ptr2len(csearch)); + set_last_csearch(PTR2CHAR(csearch), + csearch, MB_PTR2LEN(csearch)); } di = dict_find(d, (char_u *)"forward", -1); diff --git a/src/search.c b/src/search.c index de7bae86..db6d04c6 100644 --- a/src/search.c +++ b/src/search.c @@ -451,8 +451,8 @@ last_csearch_until() void set_last_csearch(c, s, len) int c; - char_u *s; - int len; + char_u *s UNUSED; + int len UNUSED; { *lastc = c; #ifdef FEAT_MBYTE diff --git a/src/version.c b/src/version.c index fd9bf187..d229752a 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 */ /**/ + 826, +/**/ 825, /**/ 824, |