diff -C 2 -r -x *.pot -x *~ -x Makefile texinfo-4.0/lib/system.h texinfo-4.0-new/lib/system.h
*** texinfo-4.0/lib/system.h	Sat Jul 17 17:11:34 1999
--- texinfo-4.0-new/lib/system.h	Sun Nov 19 17:22:09 2000
***************
*** 135,139 ****
  #endif /* O_BINARY */
  
! #if O_BINARY
  # include <io.h>
  # ifdef __MSDOS__
--- 135,139 ----
  #endif /* O_BINARY */
  
! #if O_BINARY && !defined(__CYGWIN__)
  # include <io.h>
  # ifdef __MSDOS__
***************
*** 167,172 ****
  #else  /* not O_BINARY */
  # define SET_BINARY(f)	(void)0
! # define FOPEN_RBIN	"r"
! # define FOPEN_WBIN	"w"
  # define IS_SLASH(c)	((c) == '/')
  # define HAVE_DRIVE(n)	(0)
--- 167,177 ----
  #else  /* not O_BINARY */
  # define SET_BINARY(f)	(void)0
! # if defined(__CYGWIN__)
! #  define FOPEN_RBIN	"rb"
! #  define FOPEN_WBIN	"wb"
! # else
! #  define FOPEN_RBIN	"r"
! #  define FOPEN_WBIN	"w"
! # endif
  # define IS_SLASH(c)	((c) == '/')
  # define HAVE_DRIVE(n)	(0)
diff -C 2 -r -x *.pot -x *~ -x Makefile texinfo-4.0/makeinfo/files.c texinfo-4.0-new/makeinfo/files.c
*** texinfo-4.0/makeinfo/files.c	Tue Mar 23 16:42:44 1999
--- texinfo-4.0-new/makeinfo/files.c	Sun Nov 19 17:28:55 2000
***************
*** 169,173 ****
    while ((n = read (file, result + count, file_size)) > 0)
  #else  /* !VMS */
! #ifndef WIN32
    while ((n = read (file, result + count, file_size)) > 0)
  #else /* WIN32 */
--- 169,173 ----
    while ((n = read (file, result + count, file_size)) > 0)
  #else  /* !VMS */
! #if !defined(WIN32) && !defined(__CYGWIN__)
    while ((n = read (file, result + count, file_size)) > 0)
  #else /* WIN32 */