# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1480621505 -3600
# Node ID 70680eba19406d69a106fba013161a7f3b69ff09
# Parent  8e0e4275e91eeb94e38f29ec67fc0ccc49f79a86
commit https://github.com/vim/vim/commit/e3af763d5e6b90a9b5d5706920e669fd8f0b6c77
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Dec 1 20:37:47 2016 +0100

    patch 8.0.0115
    Problem:    When building with Cygwin libwinpthread isn't found.
    Solution:   Link winpthread statically. (jmmerz, closes https://github.com/vim/vim/issues/1255, closes https://github.com/vim/vim/issues/1256)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -81,6 +81,13 @@ ifndef STATIC_STDCPLUS
 STATIC_STDCPLUS=no
 endif
 
+
+# Link against the shared version of libwinpthread by default.  Set
+# STATIC_WINPTHREAD to "yes" to link against static version instead.
+ifndef STATIC_WINPTHREAD
+STATIC_WINPTHREAD=$(STATIC_STDCPLUS)
+endif
+
 # If the user doesn't want gettext, undefine it.
 ifeq (no, $(GETTEXT))
 GETTEXT=
@@ -817,6 +824,10 @@ LIB += -lstdc++
 endif
 endif
 
+ifeq (yes, $(STATIC_WINPTHREAD))
+LIB += -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic
+endif
+
 all: $(TARGET) vimrun.exe xxd/xxd.exe install.exe uninstal.exe GvimExt/gvimext.dll
 
 vimrun.exe: vimrun.c
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    115,
+/**/
     114,
 /**/
     113,