aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2001-01-24 14:44:05 +0000
committerDaniel Stenberg <daniel@haxx.se>2001-01-24 14:44:05 +0000
commit29bcba9a9075265cefd967a1dfdbac50a6958245 (patch)
treeb2cd905025b1bedd040cabb78dcb8053314e399d /src
parent1716dbb68af66806ef0dbf009c4393abbde91fdb (diff)
Ingo Ralf Blum's cygwin fixes
Diffstat (limited to 'src')
-rw-r--r--src/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 6016b3d57..2f3f1edc2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -48,7 +48,7 @@
/* This is now designed to have its own local setup.h */
#include "setup.h"
-#ifdef WIN32
+#if defined(WIN32)&&!defined(__CYGWIN32__)
#include <winsock.h>
#endif
@@ -1713,7 +1713,7 @@ operate(struct Configurable *config, int argc, char *argv[])
if(!config->errors)
config->errors = stderr;
-#ifdef WIN32
+#if defined(WIN32) && !defined(__CYGWIN32__)
if(!outfile && !(config->conf & CONF_GETTEXT)) {
/* We get the output to stdout and we have not got the ASCII/text flag,
then set stdout to be binary */