summaryrefslogtreecommitdiff
path: root/src/xdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-17 17:13:30 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-17 17:13:30 +0100
commit88c86eb751de9e7e410b405084d35b32fafc2a24 (patch)
treecf0c456ba4a4f0455fdcae1452e10716ae23a53c /src/xdiff
parent4131fd5509b283e978e8c6161f09643b64719787 (diff)
downloadvim-git-88c86eb751de9e7e410b405084d35b32fafc2a24.tar.gz
patch 8.1.0766: various problems when using Vim on VMSv8.1.0766
Problem: Various problems when using Vim on VMS. Solution: Various fixes. Define long_long_T. (Zoltan Arpadffy)
Diffstat (limited to 'src/xdiff')
-rw-r--r--src/xdiff/xdiff.h6
-rw-r--r--src/xdiff/xinclude.h6
2 files changed, 10 insertions, 2 deletions
diff --git a/src/xdiff/xdiff.h b/src/xdiff/xdiff.h
index a8bc1dced..783dc9df1 100644
--- a/src/xdiff/xdiff.h
+++ b/src/xdiff/xdiff.h
@@ -108,7 +108,11 @@ typedef struct s_bdiffparam {
long bsize;
} bdiffparam_t;
-#include "../vim.h"
+#ifdef VMS
+# include "[]vim.h"
+#else
+# include "../vim.h"
+#endif
#define xdl_malloc(x) lalloc((x), TRUE)
#define xdl_free(ptr) vim_free(ptr)
diff --git a/src/xdiff/xinclude.h b/src/xdiff/xinclude.h
index 46b860831..752c9f3f4 100644
--- a/src/xdiff/xinclude.h
+++ b/src/xdiff/xinclude.h
@@ -22,7 +22,11 @@
/* defines HAVE_ATTRIBUTE_UNUSED */
#ifdef HAVE_CONFIG_H
-# include "../auto/config.h"
+# ifdef VMS
+# include "[.auto]config.h"
+# else
+# include "../auto/config.h"
+# endif
#endif
/* Mark unused function arguments with UNUSED, so that gcc -Wunused-parameter