Chris Sutcliffe wrote:
> > We need someone with the slightly older MingW to try it out...
>
> I reverted to the previous w32api version (3.9) which does not
> explicitly define __IID_DEFINED__ and there was an issue. Here's my
> patch that corrects it:
>
> Index: Make_ming.mak
> ===================================================================
> RCS file: /cvsroot/vim/vim7/src/Make_ming.mak,v
> retrieving revision 1.18
> diff -u -r1.18 Make_ming.mak
> --- Make_ming.mak 10 May 2007 17:35:54 -0000 1.18
> +++ Make_ming.mak 9 Aug 2007 02:41:06 -0000
> @@ -573,7 +573,7 @@
> $(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
>
> $(OUTDIR)/if_ole.o: if_ole.cpp $(INCL)
> - $(CC) $(CFLAGS) -D__IID_DEFINED__ -c -o $(OUTDIR)/if_ole.o if_ole.cpp
> + $(CC) $(CFLAGS) -c -o $(OUTDIR)/if_ole.o if_ole.cpp
>
> $(OUTDIR)/if_ruby.o: if_ruby.c $(INCL)
> ifeq (16, $(RUBY))
> Index: iid_ole.c
> ===================================================================
> RCS file: /cvsroot/vim/vim7/src/iid_ole.c,v
> retrieving revision 1.1
> diff -u -r1.1 iid_ole.c
> --- iid_ole.c 13 Jun 2004 16:45:30 -0000 1.1
> +++ iid_ole.c 10 Aug 2007 01:33:43 -0000
> @@ -16,6 +16,14 @@
> extern "C"{
> #endif
>
> +#ifdef __MINGW32__
> +#include <w32api.h>
> +
> +#if __W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 10
> +#define __IID_DEFINED__
> +#endif // __W32API_MAJOR_VERSION && __W32API_MINOR_VERSION
> +
> +#endif // __MINGW32__
>
> #ifndef __IID_DEFINED__
> #define __IID_DEFINED__
>
> I've tested with both 3.9 and 3.10 (the new w32api that does correctly
> define __IID_DEFINED__) and vim compiles cleanly.
Thanks for taking the effort to verify what works.
I'm a bit confused though. In the last part of the patch
__IID_DEFINED__ if it wasn't defined yet. Why the extra complicated #if
to define it above this? Was it defined before but to something else?
--
hundred-and-one symptoms of being an internet addict:
113. You are asked about a bus schedule, you wonder if it is 16 or 32 bits.
/// Bram Moolenaar -- [EMAIL PROTECTED] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
