[Ffmpeg-cvslog] r7990 - in trunk: configure libavformat/os_support.c libavformat/os_support.h

[mmu_man]

Author: mmu_man
Date: Thu Feb 15 14:32:06 2007
New Revision: 7990

Modified:
   trunk/configure
   trunk/libavformat/os_support.c
   trunk/libavformat/os_support.h

Log:
MinGW patch by <koyama AT infocity DOT co DOT jp>, reworked. Removed placeholder for winsock.

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Feb 15 14:32:06 2007
@@ -1572,6 +1572,8 @@
 
 enabled audio_beos && add_extralibs "-lmedia -lbe"
 
+enabled mingw32 && add_extralibs -lws2_32
+
 ##########################################
 # imlib check
 

Modified: trunk/libavformat/os_support.c
==============================================================================
--- trunk/libavformat/os_support.c	(original)
+++ trunk/libavformat/os_support.c	Thu Feb 15 14:32:06 2007
@@ -35,9 +35,14 @@
 #include <sys/time.h>
 #endif
 #include <time.h>
+
 #ifndef HAVE_SYS_POLL_H
+#if defined(__MINGW32__)
+#include <winsock2.h>
+#else
 #include <sys/select.h>
 #endif
+#endif
 
 /**
  * gets the current time in micro seconds.

Modified: trunk/libavformat/os_support.h
==============================================================================
--- trunk/libavformat/os_support.h	(original)
+++ trunk/libavformat/os_support.h	Thu Feb 15 14:32:06 2007
@@ -32,7 +32,7 @@
  * - floatf() (OS/2)
  * - strcasecmp() (OS/2)
  * - closesocket()
- * - poll() (BeOS)
+ * - poll() (BeOS, MinGW)
  */
 
 #if defined(__BEOS__) || defined(__INNOTEK_LIBC__)
@@ -45,11 +45,7 @@
 #  define usleep(t)    Sleep((t) / 1000)
 #  include <fcntl.h>
 #  define lseek(f,p,w) _lseeki64((f), (p), (w))
-#endif
-
-/* XXX: check for Winsock here */
-#if 0
-#define HAVE_CLOSESOCKET 1
+#  define HAVE_CLOSESOCKET 1
 #endif
 
 #ifdef __BEOS__