summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-06-16 16:29:10 +0000
committerBram Moolenaar <Bram@vim.org>2009-06-16 16:29:10 +0000
commitdc40a2b5f53c622e95853597f638394478aa0b83 (patch)
tree1a99b95cb0fb6aeaa0897912c15849745a1e4b74
parent2a7b9ee0a7e7f6ba64097f061c7555c0847a62b0 (diff)
updated for version 7.2-209v7.2.209
-rw-r--r--src/version.c2
-rw-r--r--src/xxd/xxd.c9
2 files changed, 7 insertions, 4 deletions
diff --git a/src/version.c b/src/version.c
index 044b2fdd4d..22d18de4a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 209,
+/**/
208,
/**/
207,
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index b9e42f6a7d..c558426ad7 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -64,6 +64,9 @@
# 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,7 +80,8 @@
#if !defined(OS2) && defined(__EMX__)
# define OS2
#endif
-#if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__)
+#if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__) \
+ || defined(CYGWIN)
# include <io.h> /* for setmode() */
#else
# ifdef UNIX
@@ -150,9 +154,6 @@ char osver[] = "";
# 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")