summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Make_cyg_ming.mak4
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index ad48a4d122..5e1822c77b 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 f294ed58b1..acd8922c1d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 879,
+/**/
878,
/**/
877,