summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure7
-rw-r--r--osdep/priority.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/configure b/configure
index ae0447bd50..2400ee4df2 100755
--- a/configure
+++ b/configure
@@ -3052,7 +3052,7 @@ echocheck "inet6"
if test "$_inet6" = auto ; then
cat > $TMPC << EOF
#include <sys/types.h>
-#if !defined(_WIN32) || defined(__CYGWIN__)
+#if !defined(_WIN32)
#include <sys/socket.h>
#include <netinet/in.h>
#else
@@ -6126,7 +6126,10 @@ echores "$_musepack"
echocheck "FAAD2 support"
if test "$_faad_internal" = auto ; then
- if x86_32 && test cc_vendor=gnu; then
+ if cygwin ; then
+ _faad_internal=no
+ res_comment="does not compile on cygwin"
+ elif x86_32 && test cc_vendor=gnu; then
case $cc_version in
3.1*|3.2) # ICE/insn with these versions
_faad_internal=no
diff --git a/osdep/priority.c b/osdep/priority.c
index c7c5a1f797..0803a3299e 100644
--- a/osdep/priority.c
+++ b/osdep/priority.c
@@ -22,7 +22,7 @@
#include "osdep.h"
-#ifdef _WIN32
+#if defined(__MINGW32__) || defined(__CYGWIN__)
#include <windows.h>
#endif