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