[MPlayer-cvslog] r32763 - in trunk: configure osdep/priority.c

[diego]

Author: diego
Date: Thu Jan  6 13:42:59 2011
New Revision: 32763

Log:
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.

Modified:
   trunk/configure
   trunk/osdep/priority.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Jan  6 13:25:33 2011	(r32762)
+++ trunk/configure	Thu Jan  6 13:42:59 2011	(r32763)
@@ -1521,12 +1521,6 @@ if win32 ; then
   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 @@ 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

Modified: trunk/osdep/priority.c
==============================================================================
--- trunk/osdep/priority.c	Thu Jan  6 13:25:33 2011	(r32762)
+++ trunk/osdep/priority.c	Thu Jan  6 13:42:59 2011	(r32763)
@@ -22,7 +22,7 @@
 
 #include "osdep.h"
 
-#ifdef _WIN32
+#if defined(__MINGW32__) || defined(__CYGWIN__)
 #include <windows.h>
 #endif