summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-11-24 19:55:46 +0000
committerBram Moolenaar <Bram@vim.org>2021-11-24 19:55:46 +0000
commit510d8e6056d89d903511c4498afec23f76b4f2a4 (patch)
tree2b84351a7d94d496072c2fed84f49ce1f9b52f7c
parent7da341560ec8db7e81cd80092b046b60a482fbbe (diff)
patch 8.2.3667: building libvterm fails with MSVCv8.2.3667
Problem: Building libvterm fails with MSVC. Solution: Don't use C99 construct.
-rw-r--r--src/libvterm/src/state.c14
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 6 deletions
diff --git a/src/libvterm/src/state.c b/src/libvterm/src/state.c
index e3c76bc1a1..4fddf5b2ab 100644
--- a/src/libvterm/src/state.c
+++ b/src/libvterm/src/state.c
@@ -1768,12 +1768,14 @@ static void osc_selection(VTermState *state, VTermStringFragment frag)
if(!frag.len || (state->selection.buflen - bufcur) < 3) {
if(bufcur) {
- (*state->selection.callbacks->set)(state->tmp.selection.mask, (VTermStringFragment){
- .str = state->selection.buffer,
- .len = bufcur,
- .initial = state->tmp.selection.state == SELECTION_SET_INITIAL,
- .final = frag.final,
- }, state->selection.user);
+ VTermStringFragment setfrag = {
+ state->selection.buffer, // str
+ bufcur, // len
+ state->tmp.selection.state == SELECTION_SET_INITIAL, // initial
+ frag.final // final
+ };
+ (*state->selection.callbacks->set)(state->tmp.selection.mask,
+ setfrag, state->selection.user);
state->tmp.selection.state = SELECTION_SET;
}
diff --git a/src/version.c b/src/version.c
index 527691c920..42cfafa946 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3667,
+/**/
3666,
/**/
3665,