From dcbdd82d059a9b621e09f4447446a92ae2562e16 Mon Sep 17 00:00:00 2001 From: "K.Takata" Date: Mon, 14 Nov 2022 14:50:15 +0000 Subject: [PATCH] patch 9.0.0879: unnecessary nesting in makefile Problem: Unnecessary nesting in makefile. Solution: Join "else" and "ifeq". (Ken Takata, closes #11547) --- src/Make_cyg_ming.mak | 4 +--- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index ad48a4d12..5e1822c77 100644 --- 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 f294ed58b..acd8922c1 100644 --- 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, /**/ -- 2.40.0