Hi, The patch to fix the build problems with the tiny build is attached.
- Yegappan On Tue, Sep 8, 2015 at 3:46 PM, Tony Mechelynck <antoine.mechely...@gmail.com> wrote: > After adding patches 855 to 861, plus runtime files changeset after patch 861 > (from Mercurial mirror https://bitbucket.org/vim-mirror/vim): > > In Huge build: > [...] > gcc -c -I. -Iproto -DHAVE_CONFIG_H -DFEAT_GUI_GTK -pthread > -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/pango-1.0 > -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 > -I/usr/include/libdrm -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 > -I/usr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz > -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 > -I/usr/lib64/glib-2.0/include -I/usr/include/freetype2 -O2 > -fno-strength-reduce -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 > -I/usr/include -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_LARGEFILE64_SOURCE=1 > -o objects/ex_cmds2.o ex_cmds2.c > ex_cmds2.c: In function ‘ex_listdo’: > ex_cmds2.c:2630:6: warning: ‘qf_size’ may be used uninitialized in this > function [-Wmaybe-uninitialized] > if (i >= qf_size || i >= eap->line2) > ^ > [...] > gcc -c -I. -Iproto -DHAVE_CONFIG_H -DFEAT_GUI_GTK -pthread > -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/pango-1.0 > -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 > -I/usr/include/libdrm -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 > -I/usr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz > -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 > -I/usr/lib64/glib-2.0/include -I/usr/include/freetype2 -O2 > -fno-strength-reduce -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 > -I/usr/include -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_LARGEFILE64_SOURCE=1 > -o objects/gui_gtk.o gui_gtk.c > gui_gtk.c: In function ‘add_stock_icon’: > gui_gtk.c:152:5: warning: ‘gdk_pixbuf_new_from_inline’ is deprecated > (declared at /usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h:314) > [-Wdeprecated-declarations] > pixbuf = gdk_pixbuf_new_from_inline(data_length, inline_data, FALSE, > NULL); > ^ > [...] > Huge build links OK > > In Tiny build: > [...] > gcc -c -I. -Iproto -DHAVE_CONFIG_H -O2 -fno-strength-reduce -Wall > -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -o objects/ex_docmd.o ex_docmd.c > ex_docmd.c: In function ‘do_one_cmd’: > ex_docmd.c:2177:3: warning: implicit declaration of function > ‘qf_get_cur_valid_idx’ [-Wimplicit-function-declaration] > ea.line2 = qf_get_cur_valid_idx(&ea); > ^ > ex_docmd.c:2241:4: warning: implicit declaration of function ‘qf_get_size’ > [-Wimplicit-function-declaration] > ea.line2 = qf_get_size(&ea); > ^ > [...] > link.sh: $LINK_AS_NEEDED set to 'yes': invoking linker directly. > gcc -L/usr/local/lib -Wl,--as-needed -o vi objects/buffer.o > objects/blowfish.o objects/charset.o objects/crypt.o objects/crypt_zip.o > objects/diff.o objects/digraph.o objects/edit.o objects/eval.o > objects/ex_cmds.o objects/ex_cmds2.o objects/ex_docmd.o objects/ex_eval.o > objects/ex_getln.o objects/fileio.o objects/fold.o objects/getchar.o > objects/hardcopy.o objects/hashtab.o objects/if_cscope.o > objects/if_xcmdsrv.o objects/mark.o objects/memline.o objects/menu.o > objects/message.o objects/misc1.o objects/misc2.o objects/move.o > objects/mbyte.o objects/normal.o objects/ops.o objects/option.o > objects/os_unix.o objects/pathdef.o objects/popupmnu.o objects/quickfix.o > objects/regexp.o objects/screen.o objects/search.o objects/sha256.o > objects/spell.o objects/syntax.o objects/tag.o objects/term.o objects/ui.o > objects/undo.o objects/version.o objects/window.o > objects/netbeans.o objects/main.o objects/memfile.o -lm -ltinfo -lnsl > -lgpm -ldl > objects/ex_docmd.o: In function `invalid_range': > ex_docmd.c:(.text+0x1e1): undefined reference to `qf_get_size' > objects/ex_docmd.o: In function `get_address': > ex_docmd.c:(.text+0xd3d): undefined reference to `qf_get_cur_valid_idx' > ex_docmd.c:(.text+0xdb6): undefined reference to `qf_get_size' > ex_docmd.c:(.text+0xebf): undefined reference to `qf_get_cur_valid_idx' > objects/ex_docmd.o: In function `do_cmdline': > ex_docmd.c:(.text+0x4566): undefined reference to `qf_get_cur_valid_idx' > ex_docmd.c:(.text+0x48f2): undefined reference to `qf_get_size' > ex_docmd.c:(.text+0x5830): undefined reference to `qf_get_size' > objects/move.o: In function `scroll_cursor_top': > move.c:(.text+0x9c0): undefined reference to `plines_nofill' > collect2: error: ld returned 1 exit status > link.sh: Linking failed > Makefile:1756: recipe for target 'vi' failed > make: *** [vi] Error 1 > > Tiny build fails to link, as seen above. > > > Best regards, > Tony. > -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 35b6637..8ea4ec3 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -2173,9 +2173,11 @@ do_one_cmd(cmdlinep, sourcing, lnum = CURRENT_TAB_NR; ea.line2 = lnum; break; +#ifdef FEAT_QUICKFIX case ADDR_QUICKFIX: ea.line2 = qf_get_cur_valid_idx(&ea); break; +#endif } ea.cmd = skipwhite(ea.cmd); lnum = get_address(&ea, &ea.cmd, ea.addr_type, ea.skip, ea.addr_count == 0); @@ -2236,12 +2238,14 @@ do_one_cmd(cmdlinep, sourcing, ea.line2 = ARGCOUNT; } break; +#ifdef FEAT_QUICKFIX case ADDR_QUICKFIX: ea.line1 = 1; ea.line2 = qf_get_size(&ea); if (ea.line2 == 0) ea.line2 = 1; break; +#endif } ++ea.addr_count; } @@ -2702,11 +2706,13 @@ do_one_cmd(cmdlinep, sourcing, else ea.line2 = ARGCOUNT; break; +#ifdef FEAT_QUICKFIX case ADDR_QUICKFIX: ea.line2 = qf_get_size(&ea); if (ea.line2 == 0) ea.line2 = 1; break; +#endif } } @@ -4381,9 +4387,11 @@ get_address(eap, ptr, addr_type, skip, to_other_file) case ADDR_TABS: lnum = CURRENT_TAB_NR; break; +#ifdef FEAT_QUICKFIX case ADDR_QUICKFIX: lnum = qf_get_cur_valid_idx(eap); break; +#endif } break; @@ -4416,11 +4424,13 @@ get_address(eap, ptr, addr_type, skip, to_other_file) case ADDR_TABS: lnum = LAST_TAB_NR; break; +#ifdef FEAT_QUICKFIX case ADDR_QUICKFIX: lnum = qf_get_size(eap); if (lnum == 0) lnum = 1; break; +#endif } break; @@ -4596,9 +4606,11 @@ get_address(eap, ptr, addr_type, skip, to_other_file) case ADDR_TABS: lnum = CURRENT_TAB_NR; break; +#ifdef FEAT_QUICKFIX case ADDR_QUICKFIX: lnum = qf_get_cur_valid_idx(eap); break; +#endif } } @@ -4737,10 +4749,12 @@ invalid_range(eap) if (eap->line2 > LAST_TAB_NR) return (char_u *)_(e_invrange); break; +#ifdef FEAT_QUICKFIX case ADDR_QUICKFIX: if (eap->line2 != 1 && eap->line2 > qf_get_size(eap)) return (char_u *)_(e_invrange); break; +#endif } } return NULL; diff --git a/src/move.c b/src/move.c index 449382f..612aeca 100644 --- a/src/move.c +++ b/src/move.c @@ -1769,7 +1769,9 @@ scroll_cursor_top(min_scroll, always) i = 1; else #endif +#ifdef FEAT_DIFF i = plines_nofill(top); +#endif used += i; if (extra + i <= off && bot < curbuf->b_ml.ml_line_count) {