diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-08-16 15:34:57 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-08-16 15:34:57 +0000 |
| commit | 1c892474a8b8085ad65c51848c05ac70c2192ee5 (patch) | |
| tree | 06dd4929644e6e6a9ead2da5e86598aefd274d5d | |
| parent | cbb37ad6fd6143ca812a693ae47c484a4e478dab (diff) | |
updated for version 7.0-057v7.0.057
| -rw-r--r-- | src/if_ole.cpp | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/if_ole.cpp b/src/if_ole.cpp index a92f3a75d1..fad2097e12 100644 --- a/src/if_ole.cpp +++ b/src/if_ole.cpp @@ -13,14 +13,23 @@ * See os_mswin.c for the client side. */ +/* + * We have some trouble with order of includes here. For Borland it needs to + * be different from MSVC... + */ +#ifndef __BORLANDC__ extern "C" { -#include "vim.h" +# include "vim.h" } +#endif #include <windows.h> #include <oleauto.h> extern "C" { +#ifdef __BORLANDC__ +# include "vim.h" +#endif extern HWND s_hwnd; extern HWND vim_parent_hwnd; } diff --git a/src/version.c b/src/version.c index cfa4666d48..ef4fbac76b 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 57, +/**/ 56, /**/ 55, |