changeset 2851:c76efe33a3c1 v7.3.199

updated for version 7.3.199 Problem: MS-Windows: Compilation problem of OLE with MingW compiler. Solution: Put #ifdef around declarations. (Guopeng Wen)
author Bram Moolenaar <bram@vim.org>
date Wed, 25 May 2011 12:09:50 +0200
parents f0cc719cd129
children 1c0e2e7c5342
files src/if_ole.h src/version.c
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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__
--- 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,