From f9e90a19b620e2347e08f84bdd68f94e69797a94 Mon Sep 17 00:00:00 2001
From: Steve Hay <steve.m.hay@googlemail.com>
Date: Tue, 10 Jul 2018 08:40:41 +0100
Subject: [PATCH] Tidy-up from previous commit for consistency with other win32
 makefiles

---
 win32/GNUmakefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/win32/GNUmakefile b/win32/GNUmakefile
index 06aff86c19ad..9384120d8eae 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -1313,7 +1313,8 @@ $(MINIDIR)\.exists : $(CFGH_TMPL)
 	echo #undef NVef&& \
 	echo #undef NVff&& \
 	echo #undef NVgf&& \
-	echo #undef USE_LONG_DOUBLE)>> config.h
+	echo #undef USE_LONG_DOUBLE&& \
+	echo #undef USE_CPLUSPLUS)>> config.h
 ifeq ($(CCTYPE),MSVC140)
 	@(echo #undef FILE_ptr&& \
 	echo #undef FILE_cnt&& \