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 | 72952de23993ecb8d4223b3d0db6e8c5c42d56e0 (patch) | |
| tree | ae1a315756877fd12b9e6a13ebd93dc2a78623f9 | |
| parent | 9b486ca3915bf457ddbd6f55f28a1f143b8f63c3 (diff) | |
| download | vim-git-72952de23993ecb8d4223b3d0db6e8c5c42d56e0.tar.gz | |
updated for version 7.3.199v7.3.199
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 0b48b92ff..5749cdb75 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 b4f3ff65e..0136d6117 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, |