Skip to content
Browse files

updated for version 7.1-065

  • Loading branch information...
1 parent 67daacd commit bbb1e02d568aef1a1cf20d0ceba65a42aa12ca77 vimboss committed Aug 12, 2007
Showing with 17 additions and 5 deletions.
  1. +2 −1 src/Make_ming.mak
  2. +13 −4 src/iid_ole.c
  3. +2 −0 src/version.c
View
3 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))
View
17 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}};
View
2 src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 65,
+/**/
64,
/**/
63,

0 comments on commit bbb1e02

Please sign in to comment.
Something went wrong with that request. Please try again.