Index: src/xxd/xxd.c
===================================================================
RCS file: /cvsroot/vim/vim7/src/xxd/xxd.c,v
retrieving revision 1.9
diff -c -r1.9 xxd.c
*** src/xxd/xxd.c	3 Dec 2007 20:32:21 -0000	1.9
--- src/xxd/xxd.c	8 Jun 2009 03:06:34 -0000
***************
*** 64,69 ****
--- 64,72 ----
  # define _CRT_SECURE_NO_DEPRECATE
  # define _CRT_NONSTDC_NO_DEPRECATE
  #endif
+ #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
+ # define CYGWIN
+ #endif
  
  #include <stdio.h>
  #ifdef VAXC
***************
*** 77,83 ****
  #if !defined(OS2) && defined(__EMX__)
  # define OS2
  #endif
! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__)
  # include <io.h>	/* for setmode() */
  #else
  # ifdef UNIX
--- 80,87 ----
  #if !defined(OS2) && defined(__EMX__)
  # define OS2
  #endif
! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__) \
!   || defined(CYGWIN)
  # include <io.h>	/* for setmode() */
  #else
  # ifdef UNIX
***************
*** 150,158 ****
  # endif
  #endif
  
- #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
- # define CYGWIN
- #endif
  #if defined(MSDOS) || defined(WIN32) || defined(OS2)
  # define BIN_READ(yes)  ((yes) ? "rb" : "rt")
  # define BIN_WRITE(yes) ((yes) ? "wb" : "wt")
--- 154,159 ----