From 802803a028ba754267f7be2ea677a7186ac871b9 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 16 Dec 2019 11:59:46 +0100
Subject: [PATCH] libport: Fix the Cygwin build.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47959
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 configure           | 2 +-
 configure.ac        | 2 +-
 include/wine/port.h | 2 +-
 libs/port/spawn.c   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 0450cb04fb1..61327c673d9 100755
--- a/configure
+++ b/configure
@@ -17442,7 +17442,7 @@ fi ;;
     MSVCRTFLAGS=""
 
   case $host_os in
-    cygwin*|mingw32*) ;;
+    mingw32*) ;;
     *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5
 $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; }
 if ${ac_cv_cflags__fno_builtin+:} false; then :
diff --git a/configure.ac b/configure.ac
index 2117e500f90..8a121bce016 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2054,7 +2054,7 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=
   dnl Disable gcc builtins except for Mingw
   AC_SUBST(MSVCRTFLAGS,"")
   case $host_os in
-    cygwin*|mingw32*) ;;
+    mingw32*) ;;
     *) WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"])
        WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;;
   esac
diff --git a/include/wine/port.h b/include/wine/port.h
index 264f2828373..feb0558655d 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -47,7 +47,7 @@
  * Hard-coded values for the Windows platform
  */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__CYGWIN__)
 
 #include <direct.h>
 #include <io.h>
diff --git a/libs/port/spawn.c b/libs/port/spawn.c
index 9292005ead9..e19aa615a5d 100644
--- a/libs/port/spawn.c
+++ b/libs/port/spawn.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "wine/port.h"
 
-#if !defined(HAVE__SPAWNVP) && !defined(_WIN32)
+#if !defined(HAVE__SPAWNVP) && (!defined(_WIN32) || defined(__CYGWIN__))
 
 #include <errno.h>
 #include <signal.h>