From dcc1ce2f5a640df9aca9122ecf145a1e95257cf4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 15 Oct 2014 12:07:11 +0200
Subject: [PATCH] updated for version 7.4.476 Problem: MingW: compiling with
"XPM=no" doesn't work. Solution: Check for the "no" value. (KF Leong) Also
for Cygwin. (Ken Takata)
---
src/Make_cyg.mak | 2 +-
src/Make_ming.mak | 4 ++--
src/version.c | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index 4b9985f70..abd35a6a4 100644
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -485,7 +485,7 @@ USE_STDCPLUS = yes
endif
##############################
-ifdef XPM
+ifneq ($(XPM),no)
# Only allow XPM for a GUI build.
DEFINES += -DFEAT_XPM_W32
INCLUDES += -I$(XPM)/include
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 82988629e..19b4c2fe3 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -22,7 +22,7 @@
# http://www.matcode.com/mpress.htm
#
# Maintained by Ron Aaron <ronaharon@yahoo.com> et al.
-# Updated 2012 Sep 5.
+# Updated 2014 Oct 13.
#>>>>> choose options:
# set to yes for a debug build
@@ -613,7 +613,7 @@ LIB += -ld2d1 -ldwrite
USE_STDCPLUS = yes
endif
endif
-ifdef XPM
+ifneq ($(XPM),no)
# Only allow XPM for a GUI build.
ifeq (yes, $(GUI))
OBJ += $(OUTDIR)/xpm_w32.o
diff --git a/src/version.c b/src/version.c
index 78c3baa2a..c4f560b07 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 476,
/**/
475,
/**/
--
2.40.0