diff options
| author | vimboss <devnull@localhost> | 2007-08-12 13:25:01 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2007-08-12 13:25:01 +0000 |
| commit | 436b49c9407b78eca54cd9f5e183413bc18aee46 (patch) | |
| tree | ff10792f44c2bf47445e5ac10c6750f870d9f764 | |
| parent | 10a5c722c755f5e5ba737fc4bf1eb2d7564790d1 (diff) | |
| download | vim-436b49c9407b78eca54cd9f5e183413bc18aee46.tar.gz | |
| -rw-r--r-- | src/Make_ming.mak | 3 | ||||
| -rw-r--r-- | src/iid_ole.c | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/src/Make_ming.mak b/src/Make_ming.mak index 0f2022c3..6d28e466 100644 --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -572,8 +572,9 @@ $(OUTDIR)/ex_eval.o: ex_eval.c $(INCL) ex_cmds.h $(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h $(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o +# Remove -D__IID_DEFINED__ for newer versions of the w32api $(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)) diff --git a/src/iid_ole.c b/src/iid_ole.c index 6ade213f..44802d0e 100644 --- a/src/iid_ole.c +++ b/src/iid_ole.c @@ -16,9 +16,18 @@ extern "C"{ #endif +#ifdef __MINGW32__ +# include <w32api.h> + +# if __W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 10 + /* This define is missing from older MingW versions of w32api, even though + * IID is defined. */ +# define __IID_DEFINED__ +# endif +#endif #ifndef __IID_DEFINED__ -#define __IID_DEFINED__ +# define __IID_DEFINED__ typedef struct _IID { @@ -28,12 +37,12 @@ typedef struct _IID unsigned char c[8]; } IID; -#endif // __IID_DEFINED__ +#endif #ifndef CLSID_DEFINED -#define CLSID_DEFINED +# define CLSID_DEFINED typedef IID CLSID; -#endif // CLSID_DEFINED +#endif const IID IID_IVim = {0x0F0BFAE2,0x4C90,0x11d1,{0x82,0xD7,0x00,0x04,0xAC,0x36,0x85,0x19}}; diff --git a/src/version.c b/src/version.c index 6f0eb8d9..4bbf44a1 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 65, +/**/ 64, /**/ 63, |