81c2858
To: vim-dev@vim.org
81c2858
Subject: Patch 7.2.209
81c2858
Fcc: outbox
81c2858
From: Bram Moolenaar <Bram@moolenaar.net>
81c2858
Mime-Version: 1.0
81c2858
Content-Type: text/plain; charset=UTF-8
81c2858
Content-Transfer-Encoding: 8bit
81c2858
------------
81c2858
81c2858
Patch 7.2.209
81c2858
Problem:    For xxd setmode() is undefined on Cygwin.
81c2858
Solution:   Include io.h. (Dominique Pelle)
81c2858
Files:	    src/xxd/xxd.c
81c2858
81c2858
81c2858
*** ../vim-7.2.208/src/xxd/xxd.c	2007-12-03 21:32:21.000000000 +0100
81c2858
--- src/xxd/xxd.c	2009-06-16 18:03:14.000000000 +0200
81c2858
***************
81c2858
*** 64,69 ****
81c2858
--- 64,72 ----
81c2858
  # define _CRT_SECURE_NO_DEPRECATE
81c2858
  # define _CRT_NONSTDC_NO_DEPRECATE
81c2858
  #endif
81c2858
+ #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
81c2858
+ # define CYGWIN
81c2858
+ #endif
81c2858
  
81c2858
  #include <stdio.h>
81c2858
  #ifdef VAXC
81c2858
***************
81c2858
*** 77,83 ****
81c2858
  #if !defined(OS2) && defined(__EMX__)
81c2858
  # define OS2
81c2858
  #endif
81c2858
! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__)
81c2858
  # include <io.h>	/* for setmode() */
81c2858
  #else
81c2858
  # ifdef UNIX
81c2858
--- 80,87 ----
81c2858
  #if !defined(OS2) && defined(__EMX__)
81c2858
  # define OS2
81c2858
  #endif
81c2858
! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__) \
81c2858
!   || defined(CYGWIN)
81c2858
  # include <io.h>	/* for setmode() */
81c2858
  #else
81c2858
  # ifdef UNIX
81c2858
***************
81c2858
*** 150,158 ****
81c2858
  # endif
81c2858
  #endif
81c2858
  
81c2858
- #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
81c2858
- # define CYGWIN
81c2858
- #endif
81c2858
  #if defined(MSDOS) || defined(WIN32) || defined(OS2)
81c2858
  # define BIN_READ(yes)  ((yes) ? "rb" : "rt")
81c2858
  # define BIN_WRITE(yes) ((yes) ? "wb" : "wt")
81c2858
--- 154,159 ----
81c2858
*** ../vim-7.2.208/src/version.c	2009-06-16 17:50:56.000000000 +0200
81c2858
--- src/version.c	2009-06-16 18:16:08.000000000 +0200
81c2858
***************
81c2858
*** 678,679 ****
81c2858
--- 678,681 ----
81c2858
  {   /* Add new patch number below this line */
81c2858
+ /**/
81c2858
+     209,
81c2858
  /**/
81c2858
81c2858
-- 
81c2858
"So this is it," said Arthur, "we are going to die."
81c2858
"Yes," said Ford, "except...no!  Wait a minute!"  He suddenly lunged across
81c2858
the chamber at something behind Arthur's line of vision.  "What's this
81c2858
switch?" he cried.
81c2858
"What?   Where?" cried Arthur, twisting around.
81c2858
"No, I was only fooling," said Ford, "we are going to die after all."
81c2858
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
81c2858
81c2858
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
81c2858
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
81c2858
\\\        download, build and distribute -- http://www.A-A-P.org        ///
81c2858
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///