# HG changeset patch # User vimboss # Date 1155742497 0 # Node ID c5871806d7e6c121c80030dde025a96c0ddec820 # Parent 529c6a431ff5d5612bfba4424c023dcf073c2cc1 updated for version 7.0-057 diff --git a/src/if_ole.cpp b/src/if_ole.cpp --- 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 #include 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 --- 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,