Alexandre Julliard : libport: Fix the Cygwin build.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 802803a028ba754267f7be2ea677a7186ac871b9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=802803a028ba754267f7be2ea...

Author: Alexandre Julliard 
Date:   Mon Dec 16 11:59:46 2019 +0100

libport: Fix the Cygwin build.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47959
Signed-off-by: Alexandre Julliard

---

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 0450cb04fb..61327c673d 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 2117e500f9..8a121bce01 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 264f282837..feb0558655 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 9292005ead..e19aa615a5 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>