summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2015-04-02 19:36:21 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2015-04-02 19:36:21 (GMT)
commit43eaf8f33361555f5cbe4306c17a7ca7869c61c8 (patch)
tree9dc9ff295366749d4af27cf70e3c8acbe4c990ff
parentf72761ff44ebeeb5deb19ac588ff4e3905148758 (diff)
parent1d3ab5d85d8c7536111d2c2e5d64d3b887b16b8a (diff)
downloadlz4-43eaf8f33361555f5cbe4306c17a7ca7869c61c8.zip
lz4-43eaf8f33361555f5cbe4306c17a7ca7869c61c8.tar.gz
lz4-43eaf8f33361555f5cbe4306c17a7ca7869c61c8.tar.bz2
Merge pull request #72 from fzort/master
Rebase #71
-rw-r--r--programs/lz4cli.c2
-rw-r--r--programs/lz4io.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/programs/lz4cli.c b/programs/lz4cli.c
index da5da71..888f21e 100644
--- a/programs/lz4cli.c
+++ b/programs/lz4cli.c
@@ -65,7 +65,7 @@
/****************************
* OS-specific Includes
*****************************/
-#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
+#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(_WIN32)
# include <io.h> /* _isatty */
# ifdef __MINGW32__
int _fileno(FILE *stream); /* MINGW somehow forgets to include this prototype into <stdio.h> */
diff --git a/programs/lz4io.c b/programs/lz4io.c
index 0d931fe..0a8132a 100644
--- a/programs/lz4io.c
+++ b/programs/lz4io.c
@@ -61,7 +61,7 @@
/******************************
* OS-specific Includes
******************************/
-#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
+#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(_WIN32)
# include <fcntl.h> /* _O_BINARY */
# include <io.h> /* _setmode, _fileno, _get_osfhandle */
# define SET_BINARY_MODE(file) _setmode(_fileno(file), _O_BINARY)