On 5/7/07, A.J.Mechelynck <[EMAIL PROTECTED]> wrote:
Markus Trenkwalder wrote:
> Hi list,
>
> checked out vim-7.1a.001 today from svn (#263) and tried to compile it
> with mingw-gcc and got the following error:
>
> ----8<----
> $ make -f Make_ming.mak
> gcc -c -Iproto -DWIN32 -DWINVER=0x0400 -D_WIN32_WINNT=0x0400
> -DHAVE_PATHDEF -DFEAT_BIG -DHAVE_GETTEXT -DHAVE_LOCALE_H
> -DDYNAMIC_GETTEXT -DFEAT_CSCOPE -DFEAT_NETBEANS_INTG -DFEAT_GUI_W32
> -DFEAT_CLIPBOARD -DFEAT_MBYTE -DFEAT_MBYTE_IME -DDYNAMIC_IME
> -DDYNAMIC_ICONV -pipe -w -march=i386 -Wall -O3 -fomit-frame-pointer
> -freg-struct-return -s gui_w32.c -o gobj/gui_w32.o
> gui_w32.c:236: error: redefinition of `struct tagNMTTDISPINFOA'
> gui_w32.c:246: error: redefinition of `struct tagNMTTDISPINFOW'
> make: *** [gobj/gui_w32.o] Error 1
> ----8<----
>
> My naive solution to this problem is:
> ----8<----
> --- src/gui_w32.c.000 Mon May 7 08:26:54 2007
> +++ src/gui_w32.c Mon May 7 07:01:09 2007
> @@ -232,7 +232,7 @@
> LPARAM lParam;
> } NMTTDISPINFO_NEW;
>
> -#ifndef LPNMTTDISPINFO
> +#if !defined(LPNMTTDISPINFO) && !defined(TOOLTIPTEXTA)
> typedef struct tagNMTTDISPINFOA {
> NMHDR hdr;
> LPSTR lpszText;
> ----8<----
>
> Regards
>
> Markus
>
You're not the first; there seems to have been a f*ckup in the svn commit
lately. I suggest you scrap your existing 7.1a sources and restart from
scratch, by downloading the 7.1a.000 sources then applying the 7.1a.001 patch.
Here are the files whose download I recommend:
Well, well, well... It seems that the svn repository is nearly the
same with the manually downloaded tarballs...
Here is the diff:
diff --exclude=.svn -r vim71a/Filelist svn/Filelist
571c571,572
< runtime/icons \
---
runtime/icons/README.txt \
runtime/icons/*.info \
647c648,649
< farsi \
---
farsi/README.txt \
farsi/fonts/*/far* \
Only in vim71a/farsi: CVS
diff --exclude=.svn -r vim71a/runtime/autoload/ada.vim
svn/runtime/autoload/ada.vim
4c4
< " $Id: ada.vim 448 2006-11-05 14:53:19Z krischik $
---
" $Id: ada.vim,v 1.2 2007/05/06 13:38:48 vimboss Exp $
7,8c7,8
< " $Author: krischik $
< " $Date: 2006-11-05 15:53:19 +0100 (Sun, 05 Nov 2006) $
---
" $Author: vimboss $
" $Date: 2007/05/06 13:38:48 $
10c10
< " $Revision: 448 $
---
" $Revision: 1.2 $
diff --exclude=.svn -r vim71a/runtime/autoload/adacomplete.vim
svn/runtime/autoload/adacomplete.vim
4c4
< " $Id: adacomplete.vim 448 2006-11-05 14:53:19Z krischik $
---
" $Id: adacomplete.vim,v 1.2 2007/05/06 12:44:46 vimboss Exp $
6,7c6,7
< " $Author: krischik $
< " $Date: 2006-11-05 15:53:19 +0100 (Sun, 05 Nov 2006) $
---
" $Author: vimboss $
" $Date: 2007/05/06 12:44:46 $
9c9
< " $Revision: 448 $
---
" $Revision: 1.2 $
diff --exclude=.svn -r vim71a/runtime/autoload/decada.vim
svn/runtime/autoload/decada.vim
4c4
< " $Id: decada.vim 448 2006-11-05 14:53:19Z krischik $
---
" $Id: decada.vim,v 1.2 2007/05/06 12:26:20 vimboss Exp $
7,8c7,8
< " $Author: krischik $
< " $Date: 2006-11-05 15:53:19 +0100 (Sun, 05 Nov 2006) $
---
" $Author: vimboss $
" $Date: 2007/05/06 12:26:20 $
10c10
< " $Revision: 448 $
---
" $Revision: 1.2 $
diff --exclude=.svn -r vim71a/runtime/autoload/gnat.vim
svn/runtime/autoload/gnat.vim
4c4
< " $Id: gnat.vim 448 2006-11-05 14:53:19Z krischik $
---
" $Id: gnat.vim,v 1.2 2007/05/06 14:13:49 vimboss Exp $
7,8c7,8
< " $Author: krischik $
< " $Date: 2006-11-05 15:53:19 +0100 (Sun, 05 Nov 2006) $
---
" $Author: vimboss $
" $Date: 2007/05/06 14:13:49 $
10c10
< " $Revision: 448 $
---
" $Revision: 1.2 $
diff --exclude=.svn -r vim71a/runtime/autoload/rubycomplete.vim
svn/runtime/autoload/rubycomplete.vim
4c4
< " Info: $Id: rubycomplete.vim,v 1.39 2006/12/13
21:20:47 segy Exp $
---
" Info: $Id: rubycomplete.vim,v 1.7 2007/05/06 12:07:59 vimboss
Exp $
diff --exclude=.svn -r vim71a/runtime/compiler/decada.vim
svn/runtime/compiler/decada.vim
4c4
< " $Id: decada.vim 429 2006-10-15 17:43:45Z krischik $
---
" $Id: decada.vim,v 1.2 2007/05/06 13:56:27 vimboss Exp $
7,8c7,8
< " $Author: krischik $
< " $Date: 2006-10-15 19:43:45 +0200 (So, 15 Okt 2006) $
---
" $Author: vimboss $
" $Date: 2007/05/06 13:56:27 $
10c10
< " $Revision: 429 $
---
" $Revision: 1.2 $
diff --exclude=.svn -r vim71a/runtime/compiler/gnat.vim
svn/runtime/compiler/gnat.vim
4c4
< " $Id: gnat.vim 448 2006-11-05 14:53:19Z krischik $
---
" $Id: gnat.vim,v 1.2 2007/05/06 13:43:09 vimboss Exp $
7,8c7,8
< " $Author: krischik $
< " $Date: 2006-11-05 15:53:19 +0100 (Sun, 05 Nov 2006) $
---
" $Author: vimboss $
" $Date: 2007/05/06 13:43:09 $
10c10
< " $Revision: 448 $
---
" $Revision: 1.2 $
Only in svn/runtime/doc: getscript.txt
diff --exclude=.svn -r vim71a/runtime/ftplugin/ada.vim
svn/runtime/ftplugin/ada.vim
4c4
< " $Id: ada.vim 448 2006-11-05 14:53:19Z krischik $
---
" $Id: ada.vim,v 1.4 2007/05/06 12:07:50 vimboss Exp $
7,8c7,8
< " $Author: krischik $
< " $Date: 2006-11-05 15:53:19 +0100 (Sun, 05 Nov 2006) $
---
" $Author: vimboss $
" $Date: 2007/05/06 12:07:50 $
10c10
< " $Revision: 448 $
---
" $Revision: 1.4 $
diff --exclude=.svn -r vim71a/runtime/ftplugin/bst.vim
svn/runtime/ftplugin/bst.vim
4c4
< " $Id: bst.vim,v 1.1 2006/12/27 16:25:09 tpope Exp $
---
" $Id: bst.vim,v 1.2 2007/05/06 12:51:41 vimboss Exp $
diff --exclude=.svn -r vim71a/runtime/ftplugin/cobol.vim
svn/runtime/ftplugin/cobol.vim
4c4
< " $Id: cobol.vim,v 1.5 2006/12/27 16:21:29 tpope Exp $
---
" $Id: cobol.vim,v 1.2 2007/05/06 12:24:45 vimboss Exp $
diff --exclude=.svn -r vim71a/runtime/ftplugin/ruby.vim
svn/runtime/ftplugin/ruby.vim
4c4
< " Info: $Id: ruby.vim,v 1.33 2007/03/02 04:39:38
dkearns Exp $
---
" Info: $Id: ruby.vim,v 1.9 2007/05/06 13:32:10 vimboss Exp $
Only in vim71a/runtime/icons: CVS
diff --exclude=.svn -r vim71a/runtime/indent/ada.vim svn/runtime/indent/ada.vim
4c4
< " $Id: ada.vim 448 2006-11-05 14:53:19Z krischik $
---
" $Id: ada.vim,v 1.5 2007/05/06 12:26:25 vimboss Exp $
8,9c8,9
< " $Author: krischik $
< " $Date: 2006-11-05 15:53:19 +0100 (Sun, 05 Nov 2006) $
---
" $Author: vimboss $
" $Date: 2007/05/06 12:26:25 $
11c11
< " $Revision: 448 $
---
" $Revision: 1.5 $
diff --exclude=.svn -r vim71a/runtime/indent/bst.vim svn/runtime/indent/bst.vim
4c4
< " $Id: bst.vim,v 1.1 2006/12/27 16:25:09 tpope Exp $
---
" $Id: bst.vim,v 1.2 2007/05/06 13:58:05 vimboss Exp $
diff --exclude=.svn -r vim71a/runtime/indent/cobol.vim
svn/runtime/indent/cobol.vim
4c4
< " $Id: cobol.vim,v 1.2 2006/11/08 17:00:46 tpope Exp $
---
" $Id: cobol.vim,v 1.2 2007/05/06 13:53:54 vimboss Exp $
diff --exclude=.svn -r vim71a/runtime/indent/eruby.vim
svn/runtime/indent/eruby.vim
4c4
< " Info: $Id: eruby.vim,v 1.8 2007/02/22 17:32:02 tpope
Exp $
---
" Info: $Id: eruby.vim,v 1.6 2007/05/06 12:34:30 vimboss Exp
$
diff --exclude=.svn -r vim71a/runtime/indent/ruby.vim
svn/runtime/indent/ruby.vim
4c4
< " Info: $Id: ruby.vim,v 1.39 2006/11/09 21:34:53 tpope
Exp $
---
" Info: $Id: ruby.vim,v 1.7 2007/05/06 13:12:34 vimboss Exp $
Only in svn/runtime/plugin: getscript.vim
diff --exclude=.svn -r vim71a/runtime/syntax/ada.vim svn/runtime/syntax/ada.vim
4c4
< " $Id: ada.vim 448 2006-11-05 14:53:19Z krischik $
---
" $Id: ada.vim,v 1.3 2007/05/06 14:22:55 vimboss Exp $
10,11c10,11
< " $Author: krischik $
< " $Date: 2006-11-05 15:53:19 +0100 (Sun, 05 Nov 2006) $
---
" $Author: vimboss $
" $Date: 2007/05/06 14:22:55 $
13c13
< " $Revision: 448 $
---
" $Revision: 1.3 $
diff --exclude=.svn -r vim71a/runtime/syntax/aspvbs.vim
svn/runtime/syntax/aspvbs.vim
7c7
< " Version: $Revision: 1.2 $
---
" Version: $Revision: 1.4 $
diff --exclude=.svn -r vim71a/runtime/syntax/bst.vim svn/runtime/syntax/bst.vim
5c5
< " $Id: bst.vim,v 1.6 2006/12/27 17:08:49 tpope Exp $
---
" $Id: bst.vim,v 1.3 2007/05/06 14:26:48 vimboss Exp $
diff --exclude=.svn -r vim71a/runtime/syntax/bzr.vim svn/runtime/syntax/bzr.vim
5c5
< " Revision: $Id: bzr.vim 608 2007-01-13 14:04:25Z hdima $
---
" Revision: $Id: bzr.vim,v 1.2 2007/05/06 11:54:40 vimboss Exp $
diff --exclude=.svn -r vim71a/runtime/syntax/cobol.vim
svn/runtime/syntax/cobol.vim
7c7
< " $Id$
---
" $Id: cobol.vim,v 1.3 2007/05/06 14:24:52 vimboss Exp $
diff --exclude=.svn -r vim71a/runtime/syntax/eruby.vim
svn/runtime/syntax/eruby.vim
4c4
< " Info: $Id: eruby.vim,v 1.9 2006/10/23 15:03:03
dkearns Exp $
---
" Info: $Id: eruby.vim,v 1.6 2007/05/06 13:24:48 vimboss Exp
$
diff --exclude=.svn -r vim71a/runtime/syntax/initng.vim
svn/runtime/syntax/initng.vim
7c7
< " Last Change: $Date: 2006/04/29 14:42:13 $
---
" Last Change: $Date: 2007/05/06 12:07:07 $
diff --exclude=.svn -r vim71a/runtime/syntax/masm.vim
svn/runtime/syntax/masm.vim
5,6c5,6
< " Last Change: $Date: 2006/10/11 12:34:33 $
< " $Revision: 1.42 $
---
" Last Change: $Date: 2007/05/06 12:32:12 $
" $Revision: 1.3 $
diff --exclude=.svn -r vim71a/runtime/syntax/mysql.vim
svn/runtime/syntax/mysql.vim
4c4
< " Last Change: $Date: 2004/06/13 20:12:39 $
---
" Last Change: $Date: 2007/05/06 14:28:38 $
diff --exclude=.svn -r vim71a/runtime/syntax/rnoweb.vim
svn/runtime/syntax/rnoweb.vim
6c6
< " SVN: $Id: rnoweb.vim 69 2007-03-30 08:55:36Z ranke $
---
" SVN: $Id: rnoweb.vim,v 1.4 2007/05/06 13:26:41 vimboss Exp $
diff --exclude=.svn -r vim71a/runtime/syntax/ruby.vim
svn/runtime/syntax/ruby.vim
4c4
< " Info: $Id: ruby.vim,v 1.118 2007/03/02 05:40:49 tpope
Exp $
---
" Info: $Id: ruby.vim,v 1.9 2007/05/06 12:06:31 vimboss Exp $
diff --exclude=.svn -r vim71a/runtime/syntax/xdefaults.vim
svn/runtime/syntax/xdefaults.vim
7c7
< " $Id: xdefaults.vim,v 1.10 2006-05-09 21:10:31 joze Exp $
---
" $Id: xdefaults.vim,v 1.3 2007/05/06 12:12:19 vimboss Exp $
Only in svn/runtime/tutor: tutor.gr.utf-8.orig
Only in svn/runtime/tutor: tutor.ru.utf-8.orig
Only in svn/src: po
diff --exclude=.svn -r vim71a/src/pty.c svn/src/pty.c
40c40
< /* RCS_ID("$Id: pty.c,v 1.1 2004/06/13 20:04:27 vimboss Exp $ FAU") */
---
/* RCS_ID("$Id: pty.c,v 1.4 2007/05/06 14:24:21 vimboss Exp $ FAU") */
1) the unpatched archives
http://ftp.vim.org/pub/vim/unstable/unix/vim-7.1a.tar.bz2
http://ftp.vim.org/pub/vim/unstable/extra/vim-7.1a-extra.tar.gz
http://ftp.vim.org/pub/vim/unstable/extra/vim-7.1a-lang.tar.gz
The first one is not a typo: even for Windows, I recommend the *Unix* + extra
+ lang sources. Together, they have exactly one copy of every source file
needed to compile Vim for *any* platform including Windows.
Unpack them on top of each other at what will become your Vim directory "for
compiling", maybe something like D:\build\vim : they will create a subfolder
"vim71a" and place all the sources in it, creating subfolders as needed.
I don't know if you have a bz2 decompresser program, or if your version of
"patch" will accept the patch format. In both cases, MinGW may or may not
offer the necessary packages (look there first) but I know Cygwin does. (Even
WinZip knows about the .tar and .gz formats.)
2) the patch
http://ftp.vim.org/pub/vim/unstable/patches/7.1a/7.1a.001
Download it (and optionally its sibling files README MD5 and MD5SUMS) into a
newly-created subfolder named (in my example) D:\build\vim\vim71a\patches then
apply it by using (IIUC)
D:
cd \build\vim\vim70
patch -p0 <patches\7.1a.001
See details at http://users.skynet.be/antoine.mechelynck/vim/compile.htm but
replace everywhere the directory name .../vim70/... by .../vim71a/..., even in
the name of what will become your "production" 7.1a $VIMRUNTIME after
compiling and installing.
I used Cygwin gcc and Make_cyg.mak but using MingGW and Make_ming.mak is not
very different. I trust you will know what to change in the procedure to cater
for any differences between them.
Best regards,
Tony.
--
"All snakes who wish to remain in Ireland will please raise their right
hands."
-- Saint Patrick
