projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 0a7814d6 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.065 (extra) | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.065 (extra) | |
| 11 | Problem: Win32: Compilation problem for newer version of w32api. | |
| 12 | Solution: Only define __IID_DEFINED__ when needed. (Chris Sutcliffe) | |
| 13 | Files: src/Make_ming.mak, src/iid_ole.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.064/src/Make_ming.mak Thu May 10 19:35:54 2007 | |
| 17 | --- src/Make_ming.mak Sat Aug 11 14:52:11 2007 | |
| 18 | *************** | |
| 19 | *** 572,579 **** | |
| 20 | $(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h | |
| 21 | $(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o | |
| 22 | ||
| 23 | $(OUTDIR)/if_ole.o: if_ole.cpp $(INCL) | |
| 24 | ! $(CC) $(CFLAGS) -D__IID_DEFINED__ -c -o $(OUTDIR)/if_ole.o if_ole.cpp | |
| 25 | ||
| 26 | $(OUTDIR)/if_ruby.o: if_ruby.c $(INCL) | |
| 27 | ifeq (16, $(RUBY)) | |
| 28 | --- 572,580 ---- | |
| 29 | $(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h | |
| 30 | $(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o | |
| 31 | ||
| 32 | + # Remove -D__IID_DEFINED__ for newer versions of the w32api | |
| 33 | $(OUTDIR)/if_ole.o: if_ole.cpp $(INCL) | |
| 34 | ! $(CC) $(CFLAGS) -c -o $(OUTDIR)/if_ole.o if_ole.cpp | |
| 35 | ||
| 36 | $(OUTDIR)/if_ruby.o: if_ruby.c $(INCL) | |
| 37 | ifeq (16, $(RUBY)) | |
| 38 | *** ../vim-7.1.064/src/iid_ole.c Sun Jun 13 18:45:30 2004 | |
| 39 | --- src/iid_ole.c Sat Aug 11 14:57:58 2007 | |
| 40 | *************** | |
| 41 | *** 16,24 **** | |
| 42 | extern "C"{ | |
| 43 | #endif | |
| 44 | ||
| 45 | ||
| 46 | #ifndef __IID_DEFINED__ | |
| 47 | ! #define __IID_DEFINED__ | |
| 48 | ||
| 49 | typedef struct _IID | |
| 50 | { | |
| 51 | --- 16,33 ---- | |
| 52 | extern "C"{ | |
| 53 | #endif | |
| 54 | ||
| 55 | + #ifdef __MINGW32__ | |
| 56 | + # include <w32api.h> | |
| 57 | + | |
| 58 | + # if __W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 10 | |
| 59 | + /* This define is missing from older MingW versions of w32api, even though | |
| 60 | + * IID is defined. */ | |
| 61 | + # define __IID_DEFINED__ | |
| 62 | + # endif | |
| 63 | + #endif | |
| 64 | ||
| 65 | #ifndef __IID_DEFINED__ | |
| 66 | ! # define __IID_DEFINED__ | |
| 67 | ||
| 68 | typedef struct _IID | |
| 69 | { | |
| 70 | *************** | |
| 71 | *** 28,39 **** | |
| 72 | unsigned char c[8]; | |
| 73 | } IID; | |
| 74 | ||
| 75 | ! #endif // __IID_DEFINED__ | |
| 76 | ||
| 77 | #ifndef CLSID_DEFINED | |
| 78 | ! #define CLSID_DEFINED | |
| 79 | typedef IID CLSID; | |
| 80 | ! #endif // CLSID_DEFINED | |
| 81 | ||
| 82 | const IID IID_IVim = {0x0F0BFAE2,0x4C90,0x11d1,{0x82,0xD7,0x00,0x04,0xAC,0x36,0x85,0x19}}; | |
| 83 | ||
| 84 | --- 37,48 ---- | |
| 85 | unsigned char c[8]; | |
| 86 | } IID; | |
| 87 | ||
| 88 | ! #endif | |
| 89 | ||
| 90 | #ifndef CLSID_DEFINED | |
| 91 | ! # define CLSID_DEFINED | |
| 92 | typedef IID CLSID; | |
| 93 | ! #endif | |
| 94 | ||
| 95 | const IID IID_IVim = {0x0F0BFAE2,0x4C90,0x11d1,{0x82,0xD7,0x00,0x04,0xAC,0x36,0x85,0x19}}; | |
| 96 | ||
| 97 | *** ../vim-7.1.064/src/version.c Sat Aug 11 22:22:56 2007 | |
| 98 | --- src/version.c Sun Aug 12 15:21:34 2007 | |
| 99 | *************** | |
| 100 | *** 668,669 **** | |
| 101 | --- 668,671 ---- | |
| 102 | { /* Add new patch number below this line */ | |
| 103 | + /**/ | |
| 104 | + 65, | |
| 105 | /**/ | |
| 106 | ||
| 107 | -- | |
| 108 | I'm writing a book. I've got the page numbers done. | |
| 109 | ||
| 110 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 111 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 112 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 113 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |