summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-14 23:14:45 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-14 23:14:45 +0200
commitd2cea96f6cd5352b270b5d9e257bb0670c934146 (patch)
treef5db1dab5ee91cf968852832f8a84b35b3e1a334
parent0554fa478d27c611d23a814c987eb66f9daae6f7 (diff)
downloadvim-git-d2cea96f6cd5352b270b5d9e257bb0670c934146.tar.gz
patch 8.1.1532: build failsv8.1.1532
Problem: Build fails. Solution: Add missing changes.
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/version.c b/src/version.c
index d252a1475..146f99680 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1532,
+/**/
1531,
/**/
1530,
diff --git a/src/vim.h b/src/vim.h
index 90208cdc7..a44fb5814 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2006,7 +2006,7 @@ typedef int sock_T;
# endif
/* Info about selected text */
-typedef struct VimClipboard
+typedef struct
{
int available; /* Is clipboard available? */
int owned; /* Flag: do we own the selection? */
@@ -2037,9 +2037,9 @@ typedef struct VimClipboard
int_u format; /* Vim's own special clipboard format */
int_u format_raw; /* Vim's raw text clipboard format */
# endif
-} VimClipboard;
+} Clipboard_T;
#else
-typedef int VimClipboard; /* This is required for the prototypes. */
+typedef int Clipboard_T; // This is required for the prototypes.
#endif
/* Use 64-bit stat structure if available. */