diff options
| author | Bram Moolenaar <bram@vim.org> | 2011-05-25 12:09:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2011-05-25 12:09:50 +0200 |
| commit | f244b5ebc2ecd2e8f6791314cd2dfba042e6825b (patch) | |
| tree | 96ffb2d968cfc2f7af6def0a91bf725a9315315a | |
| parent | 071a3db458de2cd41344175d1a56d6aa98e59e63 (diff) | |
| download | vim-f244b5ebc2ecd2e8f6791314cd2dfba042e6825b.tar.gz | |
Problem: MS-Windows: Compilation problem of OLE with MingW compiler.
Solution: Put #ifdef around declarations. (Guopeng Wen)
| -rw-r--r-- | src/if_ole.h | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/if_ole.h b/src/if_ole.h index 0b48b92f..5749cdb7 100644 --- a/src/if_ole.h +++ b/src/if_ole.h @@ -46,8 +46,11 @@ typedef struct Vim Vim; /* header files for imported files */ #include "oaidl.h" -void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t); -void __RPC_USER MIDL_user_free( void __RPC_FAR * ); +#ifndef __MIDL_user_allocate_free_DEFINED__ +#define __MIDL_user_allocate_free_DEFINED__ + void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t); + void __RPC_USER MIDL_user_free( void __RPC_FAR * ); +#endif #ifndef __IVim_INTERFACE_DEFINED__ #define __IVim_INTERFACE_DEFINED__ diff --git a/src/version.c b/src/version.c index b4f3ff65..0136d611 100644 --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 199, +/**/ 198, /**/ 197, |