summaryrefslogtreecommitdiff
path: root/src/if_ole.cpp
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-08-16 15:34:57 +0000
committerBram Moolenaar <Bram@vim.org>2006-08-16 15:34:57 +0000
commit1c892474a8b8085ad65c51848c05ac70c2192ee5 (patch)
tree06dd4929644e6e6a9ead2da5e86598aefd274d5d /src/if_ole.cpp
parentcbb37ad6fd6143ca812a693ae47c484a4e478dab (diff)
downloadvim-1c892474a8b8085ad65c51848c05ac70c2192ee5.zip
updated for version 7.0-057
Diffstat (limited to 'src/if_ole.cpp')
-rw-r--r--src/if_ole.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/if_ole.cpp b/src/if_ole.cpp
index a92f3a75d..fad2097e1 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;
}