configure: Don't define _WIN32 for Cygwin builds.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-10-14 11:07:56 +02:00
parent cbf94a7b2c
commit 339950a781
6 changed files with 8 additions and 10 deletions

1
configure vendored
View File

@ -5675,7 +5675,6 @@ case $host in
*-mingw32*|*-cygwin*)
enable_win16=${enable_win16:-no}
with_mingw=${with_mingw:-no}
CFLAGS="$CFLAGS -D_WIN32"
;;
esac

View File

@ -136,7 +136,6 @@ case $host in
*-mingw32*|*-cygwin*)
enable_win16=${enable_win16:-no}
with_mingw=${with_mingw:-no}
CFLAGS="$CFLAGS -D_WIN32"
;;
esac

View File

@ -81,7 +81,7 @@
# else
# define __stdcall __attribute__((ms_abi))
# endif
# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32)
# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__)
# define __stdcall __attribute__((pcs("aapcs-vfp")))
# elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi)
# define __stdcall __attribute__((ms_abi))
@ -122,7 +122,7 @@
#endif
#ifndef WINAPIV
# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32)
# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__)
# define WINAPIV __attribute__((pcs("aapcs")))
# else
# define WINAPIV __cdecl

View File

@ -72,7 +72,7 @@ extern "C" {
# else
# define __stdcall __attribute__((ms_abi))
# endif
# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32)
# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__)
# define __stdcall __attribute__((pcs("aapcs-vfp")))
# elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi)
# define __stdcall __attribute__((ms_abi))
@ -120,7 +120,7 @@ extern "C" {
# endif
#endif
#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32)
#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__)
# define WINAPIV __attribute__((pcs("aapcs")))
#else
# define WINAPIV __cdecl

View File

@ -43,7 +43,7 @@
* Hard-coded values for the Windows platform
*/
#if defined(_WIN32) && !defined(__CYGWIN__)
#ifdef _WIN32
#include <errno.h>

View File

@ -34,7 +34,7 @@
# include <unistd.h>
#endif
#if defined(_WIN32) && !defined(__CYGWIN__)
#ifdef _WIN32
# include <direct.h>
# include <io.h>
# include <process.h>
@ -201,7 +201,7 @@ static inline struct strarray strarray_fromstring( const char *str, const char *
static inline struct strarray strarray_frompath( const char *path )
{
if (!path) return empty_strarray;
#if defined(_WIN32) && !defined(__CYGWIN__)
#ifdef _WIN32
return strarray_fromstring( path, ";" );
#else
return strarray_fromstring( path, ":" );
@ -253,7 +253,7 @@ static inline void strarray_trace( struct strarray args )
static inline int strarray_spawn( struct strarray args )
{
#if defined(_WIN32) && !defined(__CYGWIN__)
#ifdef _WIN32
strarray_add( &args, NULL );
return _spawnvp( _P_WAIT, args.str[0], args.str );
#else