Mercurial > vim

comparison src/xxd/xxd.c @ 33656:38b0ea4d17cc v9.0.2067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.2067: xxd: coloring was disabled on Cygwin Commit: https://github.com/vim/vim/commit/c4a403860353ff35dc47e2a52818e771fa228083 Author: Ken Takata <kentkt@csc.jp> Date: Wed Oct 25 21:17:35 2023 +0200 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>
author Christian Brabandt <cb@256bit.org>
date Wed, 25 Oct 2023 21:30:05 +0200
parents a3616b5f5b25
children 1629cc65d78d
comparison
equal deleted inserted replaced
33655:9d818145bd76 33656:38b0ea4d17cc
86 #else 86 #else
87 # include <fcntl.h> 87 # include <fcntl.h>
88 #endif 88 #endif
89 #if defined(WIN32) || defined(CYGWIN) 89 #if defined(WIN32) || defined(CYGWIN)
90 # include <io.h> /* for setmode() */ 90 # include <io.h> /* for setmode() */
91 #endif
92 #ifdef WIN32
91 # include <windows.h> 93 # include <windows.h>
92 #endif 94 #endif
93 #ifdef UNIX 95 #ifdef UNIX
94 # include <unistd.h> 96 # include <unistd.h>
95 #endif 97 #endif
134 136
135 extern void perror __P((char *)); 137 extern void perror __P((char *));
136 # endif 138 # endif
137 #endif 139 #endif
138 140
139 char version[] = "xxd 2023-10-24 by Juergen Weigert et al."; 141 char version[] = "xxd 2023-10-25 by Juergen Weigert et al.";
140 #ifdef WIN32 142 #ifdef WIN32
141 char osver[] = " (Win32)"; 143 char osver[] = " (Win32)";
142 #else 144 #else
143 char osver[] = ""; 145 char osver[] = "";
144 #endif 146 #endif