build: cygwin: don't rely on _WIN32 being defined

configure: Compilation fixes for current Cygwin

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32724 b3059339-0415-0410-9bf9-f77b7e298cf2

Do not #define _WIN32 on the command line for Cygwin.

Newer Cygwin versions no longer do this and hopefully we should be able
to survive without this hack as well.  This change necessitates adapting
two #ifdefs in the MPlayer codebase.  It is committed untested as I do
not have access to a Cygwin system.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32763 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-12-19 22:02:52 +00:00 committed by Uoti Urpala
parent b11e69b22a
commit c46bd9a252
2 changed files with 6 additions and 3 deletions

7
configure vendored
View File

@ -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

View File

@ -22,7 +22,7 @@
#include "osdep.h"
#ifdef _WIN32
#if defined(__MINGW32__) || defined(__CYGWIN__)
#include <windows.h>
#endif