patch 9.0.0879: unnecessary nesting in makefile

Problem:    Unnecessary nesting in makefile.
Solution:   Join "else" and "ifeq". (Ken Takata, closes #11547)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index ad48a4d12227d77b43fc7e13ce510bd0af529bfc..5e1822c77b2bcb25a6d714ef57face871b5f516a 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -226,13 +226,11 @@ CXX := $(CROSS_COMPILE)g++
 endif
 ifeq ($(UNDER_CYGWIN),yes)
 WINDRES := $(CROSS_COMPILE)windres
-else
-ifeq ($(findstring clang,$(CC)),)
+else ifeq ($(findstring clang,$(CC)),)
 WINDRES := windres
 else
 WINDRES := llvm-windres
 endif
-endif
 
 # Get the default ARCH.
 ifndef ARCH

diff --git a/src/version.c b/src/version.c
index f294ed58b10016b2161c492e85697fd0891fe95d..acd8922c1d18e11e06eaf2f4854cbaa8be6abe11 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    879,
 /**/
     878,
 /**/