From: Bram Moolenaar Date: Wed, 25 May 2011 10:09:50 +0000 (+0200) Subject: updated for version 7.3.199 X-Git-Tag: v7.3.199 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72952de23993ecb8d4223b3d0db6e8c5c42d56e0;p=vim updated for version 7.3.199 Problem: MS-Windows: Compilation problem of OLE with MingW compiler. Solution: Put #ifdef around declarations. (Guopeng Wen) --- 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 @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 199, /**/ 198, /**/