From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 15 Feb 2016 21:45:12 +0000 (+0100)
Subject: patch 7.4.1326
X-Git-Tag: v7.4.1326
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97eba78f69ba68ce8e1fc72bbe762fc321e0a4b1;p=thirdparty%2Fvim.git

patch 7.4.1326
Problem:    Build rules are bit too complicated.
Solution:   Remove -lwsock32 from Netbeans, it's already added for the channel
            feature that it depends on. (Tony Mechelynck)
---

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 160fcd9c07..1c1ee8c649 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -684,17 +684,14 @@ ifneq (yes, $(GUI))
 NETBEANS=no
 else
 OBJ += $(OUTDIR)/netbeans.o
-LIB += -lwsock32
 endif
 endif
 endif
 
 ifeq ($(CHANNEL),yes)
 OBJ += $(OUTDIR)/channel.o
-ifneq ($(NETBEANS),yes)
 LIB += -lwsock32
 endif
-endif
 
 ifeq ($(DIRECTX),yes)
 # Only allow DIRECTX for a GUI build.
diff --git a/src/version.c b/src/version.c
index 8520ec5153..bd13c6d445 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1326,
 /**/
     1325,
 /**/