Thomas Liebezeit wrote:

> Hi,
>
> with the current code from the repository I get an error in term.c. (see
> below)
> I'm on windows with MSVC.
> I build with: nmake -f Make_mvc.mak GUI=yes OLE=yes CPUNR=i686
> PYTHON="C:\Program Files (x86)\Python26" DYNAMIC_PYTHON=yes PYTHON_VER=26
>
> The error came with the last update (2275).
> It is caused by the new #ifdef/#endif, without everything is fine (which
> means: compiles).
>
>
> Thomas Liebezeit
>
> ----
>
>
> hg log term.c -l 2 gives
>
> changeset:   2275:0b3be97064e5
> branch:      vim73
> tag:         tip
> user:        Bram Moolenaar <[email protected]>
> date:        Sat Jun 26 06:24:45 2010 +0200
> summary:     Various small fixes from Dominique Pelle.
>
> changeset:   2231:770485470e59
> branch:      vim73
> user:        Bram Moolenaar <[email protected]>
> date:        Sun May 30 19:00:15 2010 +0200
> summary:     Add a few #ifdefs to exclude functions that are not used.
> (Domnique
>  Pelle)
>
>
> The changes
>
>
> term.c
> term.c(5469) : error C2065: 'key_names': nichtdeklarierter Bezeichner
> term.c(5469) : error C2109: Index erfordert ein Array oder einen Zeigertyp
> term.c(5471) : error C2065: 'key_names': nichtdeklarierter Bezeichner
> term.c(5471) : error C2109: Index erfordert ein Array oder einen Zeigertyp
> term.c(5471) : error C2168: 'strcmp': Zu wenig Parameter an systeminterne
> Funkti
> on übergeben
> term.c(5473) : error C2065: 'xt_index_in': nichtdeklarierter Bezeichner
> term.c(5477) : error C2065: 'key_names': nichtdeklarierter Bezeichner
> term.c(5477) : error C2109: Index erfordert ein Array oder einen Zeigertyp
> term.c(5493) : warning C4013: 'set_color_count' undefiniert; Annahme: extern
> mit
>  Rückgabetyp int
> term.c(5510) : error C2065: 'xt_index_in': nichtdeklarierter Bezeichner
> term.c(5511) : warning C4013: 'req_more_codes_from_term' undefiniert;
> Annahme: e
> xtern mit Rückgabetyp int
> term.c(5526) : error C2065: 'xt_index_out': nichtdeklarierter Bezeichner
> term.c(5526) : error C2065: 'xt_index_out': nichtdeklarierter Bezeichner
> term.c(5526) : error C2065: 'xt_index_in': nichtdeklarierter Bezeichner


Hi

The patch I sent on 2010/05/15 contained (among other things) this
chunk for src/term.c:

--- a/src/term.c        Fri May 14 23:24:24 2010 +0200
+++ b/src/term.c        Sat May 15 18:13:18 2010 +0200
@@ -2609,6 +2609,8 @@
        out_flush();
 }

+#if defined(FEAT_GUI) || defined(FEAT_TITLE) \
+       || defined(FEAT_TERMRESPONSE) || defined(FEAT_MOUSE_TTY)
 /*
  * A never-padding out_str.
  * use this whenever you don't want to run the string through tputs.
@@ -2631,6 +2633,7 @@
     if (p_wd)
        out_flush();
 }
+#endif

This chunk was already included in 2231:770485470e59 (May 30)
to disable function out_str_nf().

Regarding the the new #if in term.c in patch 2275:0b3be97064e5,
I'm not sure where it comes from.  Maybe it's an error
which happened when trying to apply the same patch twice?
The #if in 2275:0b3be97064e5  disables a lot of functions
which are already in between other #if so it looks wrong.

I propose the revert added #if in term.c (2275:0b3be97064e5).

-- Dominique

-- 
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

Raspunde prin e-mail lui