Mercurial > mplayer.hg
changeset 32676:db882cd69776
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.
| author | diego |
|---|---|
| date | Thu, 06 Jan 2011 12:42:59 +0000 |
| parents | c70109fc98b2 |
| children | 9ff085c45a4e |
| files | configure osdep/priority.c |
| diffstat | 2 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Jan 06 12:25:33 2011 +0000 +++ b/configure Thu Jan 06 12:42:59 2011 +0000 @@ -1521,12 +1521,6 @@ def_priority="#define CONFIG_PRIORITY 1" fi -if cygwin ; then - # e.g. priority.c needs _WIN32 define, but - # latest cygwin no longer defines it - extra_cflags="-D_WIN32 $extra_cflags" -fi - if mingw32 ; then _getch=getch2-win.c _need_shmem=no @@ -3341,7 +3335,7 @@ 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