diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-15 22:45:12 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-15 22:45:12 +0100 |
| commit | 97eba78f69ba68ce8e1fc72bbe762fc321e0a4b1 (patch) | |
| tree | c1d5a9506c303ace82593ef39f8e855a123b52ea /src | |
| parent | 2368917d8f0c0a997eac7a51ddfaa748dc528392 (diff) | |
| download | vim-97eba78f69ba68ce8e1fc72bbe762fc321e0a4b1.zip | |
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Make_cyg_ming.mak | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 160fcd9c0..1c1ee8c64 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 8520ec515..bd13c6d44 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1326, +/**/ 1325, /**/ 1324, |