summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-02-12 21:46:46 +0100
committerBram Moolenaar <Bram@vim.org>2019-02-12 21:46:46 +0100
commit48773f1f83e666c49b9d88ea6a392d50215ca013 (patch)
tree588f9acd4bf8234c1d579ec6955e59f24cd84321
parente0fb7d1e38e1cf699412e212cda863420f5f8bd2 (diff)
downloadvim-git-8.1.0900.tar.gz
patch 8.1.0900: ConPTY many crash with 32-bit buildv8.1.0900
Problem: ConPTY many crash with 32-bit build. Solution: Fix function declarations. (Ken Takata, closes #3943)
-rw-r--r--src/terminal.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 27ff24f10..2544f8567 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -5489,9 +5489,9 @@ term_getjob(term_T *term)
HRESULT (WINAPI *pCreatePseudoConsole)(COORD, HANDLE, HANDLE, DWORD, HPCON*);
HRESULT (WINAPI *pResizePseudoConsole)(HPCON, COORD);
HRESULT (WINAPI *pClosePseudoConsole)(HPCON);
-BOOL (*pInitializeProcThreadAttributeList)(LPPROC_THREAD_ATTRIBUTE_LIST, DWORD, DWORD, PSIZE_T);
-BOOL (*pUpdateProcThreadAttribute)(LPPROC_THREAD_ATTRIBUTE_LIST, DWORD, DWORD_PTR, PVOID, SIZE_T, PVOID, PSIZE_T);
-void (*pDeleteProcThreadAttributeList)(LPPROC_THREAD_ATTRIBUTE_LIST);
+BOOL (WINAPI *pInitializeProcThreadAttributeList)(LPPROC_THREAD_ATTRIBUTE_LIST, DWORD, DWORD, PSIZE_T);
+BOOL (WINAPI *pUpdateProcThreadAttribute)(LPPROC_THREAD_ATTRIBUTE_LIST, DWORD, DWORD_PTR, PVOID, SIZE_T, PVOID, PSIZE_T);
+void (WINAPI *pDeleteProcThreadAttributeList)(LPPROC_THREAD_ATTRIBUTE_LIST);
static int
dyn_conpty_init(int verbose)
diff --git a/src/version.c b/src/version.c
index f3e108182..b02be7c1d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 900,
+/**/
899,
/**/
898,