Mercurial > vim
changeset 4082:17a312ba38a0 v7.3.795
updated for version 7.3.795
Problem: MzScheme does not build with tiny features.
Solution: Add #ifdefs. Also add UNUSED to avoid warnings. And change
library ordering.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 30 Jan 2013 17:41:50 +0100 |
| parents | 137abd418473 |
| children | 45b91f2bc424 |
| files | src/Makefile src/if_mzsch.c src/version.c |
| diffstat | 3 files changed, 21 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -1345,6 +1345,8 @@ LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS) +# Note: MZSCHEME_LIBS must come before LIBS, because LIBS adds -lm which is +# needed by racket. ALL_LIB_DIRS = $(GUI_LIBS_DIR) $(X_LIBS_DIR) ALL_LIBS = \ $(GUI_LIBS1) \ @@ -1353,10 +1355,10 @@ ALL_LIBS = \ $(X_PRE_LIBS) \ $(X_LIBS) \ $(X_EXTRA_LIBS) \ + $(MZSCHEME_LIBS) \ $(LIBS) \ $(EXTRA_LIBS) \ $(LUA_LIBS) \ - $(MZSCHEME_LIBS) \ $(PERL_LIBS) \ $(PYTHON_LIBS) \ $(PYTHON3_LIBS) \
--- a/src/if_mzsch.c +++ b/src/if_mzsch.c @@ -1483,7 +1483,7 @@ vim_command(void *data, int argc, Scheme /* (eval {expr-string}) */ static Scheme_Object * -vim_eval(void *data, int argc, Scheme_Object **argv) +vim_eval(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED) { #ifdef FEAT_EVAL Vim_Prim *prim = (Vim_Prim *)data; @@ -1686,10 +1686,12 @@ get_curr_win(void *data UNUSED, int argc static Scheme_Object * get_window_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED) { + int n = 0; +#ifdef FEAT_WINDOWS win_T *w; - int n = 0; for (w = firstwin; w != NULL; w = w->w_next) +#endif ++n; return scheme_make_integer(n); } @@ -1701,12 +1703,14 @@ get_window_list(void *data, int argc, Sc Vim_Prim *prim = (Vim_Prim *)data; vim_mz_buffer *buf; Scheme_Object *list; - win_T *w; + win_T *w = firstwin; buf = get_buffer_arg(prim->name, 0, argc, argv); list = scheme_null; - for (w = firstwin; w != NULL; w = w->w_next) +#ifdef FEAT_WINDOWS + for ( ; w != NULL; w = w->w_next) +#endif if (w->w_buffer == buf->buf) { list = scheme_make_pair(window_new(w), list); @@ -1755,14 +1759,16 @@ window_new(win_T *win) /* (get-win-num [window]) */ static Scheme_Object * -get_window_num(void *data, int argc, Scheme_Object **argv) +get_window_num(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED) { + int nr = 1; +#ifdef FEAT_WINDOWS Vim_Prim *prim = (Vim_Prim *)data; win_T *win = get_window_arg(prim->name, 0, argc, argv)->win; - int nr = 1; win_T *wp; for (wp = firstwin; wp != win; wp = wp->w_next) +#endif ++nr; return scheme_make_integer(nr); @@ -1773,14 +1779,16 @@ get_window_num(void *data, int argc, Sch get_window_by_num(void *data, int argc, Scheme_Object **argv) { Vim_Prim *prim = (Vim_Prim *)data; - win_T *win; + win_T *win = firstwin; int fnum; fnum = SCHEME_INT_VAL(GUARANTEE_INTEGER(prim->name, 0)); if (fnum < 1) scheme_signal_error(_("window index is out of range")); - for (win = firstwin; win != NULL; win = win->w_next, --fnum) +#ifdef FEAT_WINDOWS + for ( ; win != NULL; win = win->w_next, --fnum) +#endif if (fnum == 1) /* to be 1-based */ return window_new(win);