patch 9.0.2067: xxd: coloring was disabled on Cygwin

Problem:  xxd: coloring was disabled on Cygwin
Solution: don't include WIN32

xxd: Fix that color was disabled on Cygwin

"windows.h" was unintentionally included on Cygwin since 9.0.1834.
This accidentally disabled coloring on Cygwin.
Stop including "windows.h" on Cygwin.

closes: #13414

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Ken Takata <kentkt@csc.jp>

diff --git a/src/version.c b/src/version.c
index e45d7fa0b2ffb2b3a35932f36de0096c4a679966..1ae5c98714d1120f685080acaae01d7852098041 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2067,
 /**/
     2066,
 /**/

diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 94a0e6146077545cf8e645d4296b496897ed2b1b..c90bc027e8daebec50fadcc4e5f27a5501d7354f 100644 (file)
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -88,6 +88,8 @@
 #endif
 #if defined(WIN32) || defined(CYGWIN)
 # include <io.h>       /* for setmode() */
+#endif
+#ifdef WIN32
 # include <windows.h>
 #endif
 #ifdef UNIX
@@ -136,7 +138,7 @@ extern void perror __P((char *));
 # endif
 #endif
 
-char version[] = "xxd 2023-10-24 by Juergen Weigert et al.";
+char version[] = "xxd 2023-10-25 by Juergen Weigert et al.";
 #ifdef WIN32
 char osver[] = " (Win32)";
 #else