From c4a403860353ff35dc47e2a52818e771fa228083 Mon Sep 17 00:00:00 2001 From: Ken Takata Date: Wed, 25 Oct 2023 21:17:35 +0200 Subject: 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 Co-authored-by: Ken Takata --- src/version.c | 2 ++ src/xxd/xxd.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/version.c b/src/version.c index e45d7fa0b2..1ae5c98714 100644 --- 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 94a0e61460..c90bc027e8 100644 --- a/src/xxd/xxd.c +++ b/src/xxd/xxd.c @@ -88,6 +88,8 @@ #endif #if defined(WIN32) || defined(CYGWIN) # include /* for setmode() */ +#endif +#ifdef WIN32 # include #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 -- cgit v1.2.3