updated for version 7.0-057v7.0.057

1 files changed, 10 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;
 }