diff options
| author | Ken Takata <kentkt@csc.jp> | 2023-10-25 21:17:35 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-10-25 21:17:35 +0200 |
| commit | c4a403860353ff35dc47e2a52818e771fa228083 (patch) | |
| tree | b7bc15bd61de6d55e4c68f6f896d1d7459dbe464 /src | |
| parent | 1c14030aff238abef03bdf87e6b33c7e5d7ffd51 (diff) | |
patch 9.0.2067: xxd: coloring was disabled on Cygwinv9.0.2067
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xxd/xxd.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c index e45d7fa0b2..1ae5c98714 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2067, +/**/ 2066, /**/ 2065, 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 <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 |