To: vim-dev@vim.org

Subject: Patch 7.2.209

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.2.209

Problem:    For xxd setmode() is undefined on Cygwin.

Solution:   Include io.h. (Dominique Pelle)

Files:	    src/xxd/xxd.c

*** ../vim-7.2.208/src/xxd/xxd.c	2007-12-03 21:32:21.000000000 +0100

--- src/xxd/xxd.c	2009-06-16 18:03:14.000000000 +0200

***************

*** 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 ----

*** ../vim-7.2.208/src/version.c	2009-06-16 17:50:56.000000000 +0200

--- src/version.c	2009-06-16 18:16:08.000000000 +0200

***************

*** 678,679 ****

--- 678,681 ----

  {   /* Add new patch number below this line */

+ /**/

+     209,

  /**/

-- 

"So this is it," said Arthur, "we are going to die."

"Yes," said Ford, "except...no!  Wait a minute!"  He suddenly lunged across

the chamber at something behind Arthur's line of vision.  "What's this

switch?" he cried.

"What?   Where?" cried Arthur, twisting around.

"No, I was only fooling," said Ford, "we are going to die after all."

		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\        download, build and distribute -- http://www.A-A-P.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///