On 2014-08-23 14:19, Bram Moolenaar wrote:
Patch 7.4.415 (after 7.4.414)
Problem: Cannot build. Warning for shadowed variable. (John Little)
Solution: Add missing change. Remove declaration.
Files: src/vim.h, src/ex_docmd.c
*** ../vim-7.4.414/src/vim.h 2014-08-06 14:52:05.047236174 +0200
--- src/vim.h 2014-08-22 20:26:19.522953712 +0200
***************
*** 1326,1331 ****
--- 1326,1332 ----
EVENT_SHELLFILTERPOST, /* after ":1,2!cmd", ":w !cmd", ":r !cmd". */
EVENT_TEXTCHANGED, /* text was modified */
EVENT_TEXTCHANGEDI, /* text was modified in Insert mode*/
+ EVENT_CMDUNDEFINED, /* command undefined */
NUM_EVENTS /* MUST be the last one */
};
*** ../vim-7.4.414/src/ex_docmd.c 2014-08-22 23:05:50.102606614 +0200
--- src/ex_docmd.c 2014-08-23 14:11:52.640635039 +0200
***************
*** 2150,2158 ****
&& ASCII_ISUPPER(*ea.cmd)
&& has_cmdundefined())
{
- char_u *p = ea.cmd;
int ret;
while (ASCII_ISALNUM(*p))
++p;
p = vim_strnsave(ea.cmd, p - ea.cmd);
--- 2150,2158 ----
&& ASCII_ISUPPER(*ea.cmd)
&& has_cmdundefined())
{
int ret;
+ p = ea.cmd;
while (ASCII_ISALNUM(*p))
++p;
p = vim_strnsave(ea.cmd, p - ea.cmd);
*** ../vim-7.4.415/src/version.c 2014-08-22 23:05:50.106606614 +0200
--- src/version.c 2014-08-23 14:15:50.620626408 +0200
***************
*** 743,744 ****
--- 743,746 ----
{ /* Add new patch number below this line */
+ /**/
+ 415,
/**/
I just pulled the latest changes via Mercurial and the compilation halts
when building with features=huge under Slackware 14.1:
gcc -c -I. -Iproto -DHAVE_CONFIG_H -O2 -fPIC -U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=1 -o objects/buffer.o buffer.c
gcc -c -I. -Iproto -DHAVE_CONFIG_H -O2 -fPIC -U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=1 -o objects/blowfish.o blowfish.c
gcc -c -I. -Iproto -DHAVE_CONFIG_H -O2 -fPIC -U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=1 -o objects/charset.o charset.c
gcc -c -I. -Iproto -DHAVE_CONFIG_H -O2 -fPIC -U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=1 -o objects/crypt.o crypt.c
gcc -c -I. -Iproto -DHAVE_CONFIG_H -O2 -fPIC -U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=1 -o objects/crypt_zip.o crypt_zip.c
gcc -c -I. -Iproto -DHAVE_CONFIG_H -O2 -fPIC -U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=1 -o objects/diff.o diff.c
gcc -c -I. -Iproto -DHAVE_CONFIG_H -O2 -fPIC -U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=1 -o objects/digraph.o digraph.c
In file included from blowfish.c:22:0:
vim.h:1330:5: fel: omdeklaration av uppräkningstyp ”EVENT_CMDUNDEFINED”
EVENT_CMDUNDEFINED, /* command undefined */
^
vim.h:1268:5: anm: tidigare definition av ”EVENT_CMDUNDEFINED” var här
EVENT_CMDUNDEFINED, /* on unexistent command */
^
In file included from buffer.c:28:0:
vim.h:1330:5: fel: omdeklaration av uppräkningstyp ”EVENT_CMDUNDEFINED”
EVENT_CMDUNDEFINED, /* command undefined */
^
vim.h:1268:5: anm: tidigare definition av ”EVENT_CMDUNDEFINED” var här
EVENT_CMDUNDEFINED, /* on unexistent command */
^
In file included from charset.c:10:0:
vim.h:1330:5: fel: omdeklaration av uppräkningstyp ”EVENT_CMDUNDEFINED”
EVENT_CMDUNDEFINED, /* command undefined */
^
vim.h:1268:5: anm: tidigare definition av ”EVENT_CMDUNDEFINED” var här
EVENT_CMDUNDEFINED, /* on unexistent command */
^
In file included from crypt.c:13:0:
vim.h:1330:5: fel: omdeklaration av uppräkningstyp ”EVENT_CMDUNDEFINED”
EVENT_CMDUNDEFINED, /* command undefined */
^
vim.h:1268:5: anm: tidigare definition av ”EVENT_CMDUNDEFINED” var här
EVENT_CMDUNDEFINED, /* on unexistent command */
^
In file included from crypt_zip.c:13:0:
vim.h:1330:5: fel: omdeklaration av uppräkningstyp ”EVENT_CMDUNDEFINED”
EVENT_CMDUNDEFINED, /* command undefined */
^
vim.h:1268:5: anm: tidigare definition av ”EVENT_CMDUNDEFINED” var här
EVENT_CMDUNDEFINED, /* on unexistent command */
^
In file included from diff.c:14:0:
vim.h:1330:5: fel: omdeklaration av uppräkningstyp ”EVENT_CMDUNDEFINED”
EVENT_CMDUNDEFINED, /* command undefined */
^
vim.h:1268:5: anm: tidigare definition av ”EVENT_CMDUNDEFINED” var här
EVENT_CMDUNDEFINED, /* on unexistent command */
^
In file included from digraph.c:14:0:
vim.h:1330:5: fel: omdeklaration av uppräkningstyp ”EVENT_CMDUNDEFINED”
EVENT_CMDUNDEFINED, /* command undefined */
^
vim.h:1268:5: anm: tidigare definition av ”EVENT_CMDUNDEFINED” var här
EVENT_CMDUNDEFINED, /* on unexistent command */
^
make[1]: *** [objects/crypt_zip.o] Fel 1
make[1]: *** Inväntar oavslutade jobb...
make[1]: *** [objects/crypt.o] Fel 1
make[1]: *** [objects/blowfish.o] Fel 1
make[1]: *** [objects/digraph.o] Fel 1
make[1]: *** [objects/buffer.o] Fel 1
make[1]: *** [objects/charset.o] Fel 1
make[1]: *** [objects/diff.o] Fel 1
make[1]: Lämnar katalogen "/tmp/vim74/src"
make: *** [first] Fel 2
Starting make in the src directory.
If there are problems, cd to the src directory and run make there
cd src && make first
make[1]: Går till katalogen "/tmp/vim74/src"
gcc -c -I. -Iproto -DHAVE_CONFIG_H -O2 -fPIC -U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=1 -o objects/buffer.o buffer.c
In file included from buffer.c:28:0:
vim.h:1330:5: fel: omdeklaration av uppräkningstyp ”EVENT_CMDUNDEFINED”
EVENT_CMDUNDEFINED, /* command undefined */
^
vim.h:1268:5: anm: tidigare definition av ”EVENT_CMDUNDEFINED” var här
EVENT_CMDUNDEFINED, /* on unexistent command */
^
make[1]: *** [objects/buffer.o] Fel 1
make[1]: Lämnar katalogen "/tmp/vim74/src"
make: *** [first] Fel 2
bash-4.3#
Regards,
Mats
--
--
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 [email protected].
For more options, visit https://groups.google.com/d/optout.
