|
1 To: [email protected] |
|
2 Subject: Patch 7.2.209 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=UTF-8 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.209 |
|
11 Problem: For xxd setmode() is undefined on Cygwin. |
|
12 Solution: Include io.h. (Dominique Pelle) |
|
13 Files: src/xxd/xxd.c |
|
14 |
|
15 |
|
16 *** ../vim-7.2.208/src/xxd/xxd.c 2007-12-03 21:32:21.000000000 +0100 |
|
17 --- src/xxd/xxd.c 2009-06-16 18:03:14.000000000 +0200 |
|
18 *************** |
|
19 *** 64,69 **** |
|
20 --- 64,72 ---- |
|
21 # define _CRT_SECURE_NO_DEPRECATE |
|
22 # define _CRT_NONSTDC_NO_DEPRECATE |
|
23 #endif |
|
24 + #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__)) |
|
25 + # define CYGWIN |
|
26 + #endif |
|
27 |
|
28 #include <stdio.h> |
|
29 #ifdef VAXC |
|
30 *************** |
|
31 *** 77,83 **** |
|
32 #if !defined(OS2) && defined(__EMX__) |
|
33 # define OS2 |
|
34 #endif |
|
35 ! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__) |
|
36 # include <io.h> /* for setmode() */ |
|
37 #else |
|
38 # ifdef UNIX |
|
39 --- 80,87 ---- |
|
40 #if !defined(OS2) && defined(__EMX__) |
|
41 # define OS2 |
|
42 #endif |
|
43 ! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__) \ |
|
44 ! || defined(CYGWIN) |
|
45 # include <io.h> /* for setmode() */ |
|
46 #else |
|
47 # ifdef UNIX |
|
48 *************** |
|
49 *** 150,158 **** |
|
50 # endif |
|
51 #endif |
|
52 |
|
53 - #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__)) |
|
54 - # define CYGWIN |
|
55 - #endif |
|
56 #if defined(MSDOS) || defined(WIN32) || defined(OS2) |
|
57 # define BIN_READ(yes) ((yes) ? "rb" : "rt") |
|
58 # define BIN_WRITE(yes) ((yes) ? "wb" : "wt") |
|
59 --- 154,159 ---- |
|
60 *** ../vim-7.2.208/src/version.c 2009-06-16 17:50:56.000000000 +0200 |
|
61 --- src/version.c 2009-06-16 18:16:08.000000000 +0200 |
|
62 *************** |
|
63 *** 678,679 **** |
|
64 --- 678,681 ---- |
|
65 { /* Add new patch number below this line */ |
|
66 + /**/ |
|
67 + 209, |
|
68 /**/ |
|
69 |
|
70 -- |
|
71 "So this is it," said Arthur, "we are going to die." |
|
72 "Yes," said Ford, "except...no! Wait a minute!" He suddenly lunged across |
|
73 the chamber at something behind Arthur's line of vision. "What's this |
|
74 switch?" he cried. |
|
75 "What? Where?" cried Arthur, twisting around. |
|
76 "No, I was only fooling," said Ford, "we are going to die after all." |
|
77 -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" |
|
78 |
|
79 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
80 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
81 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
82 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |