mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
MinGW patch by <koyama AT infocity DOT co DOT jp>, reworked. Removed placeholder for winsock.
Originally committed as revision 7990 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
5286d11fcd
commit
36c07acd59
2
configure
vendored
2
configure
vendored
@ -1572,6 +1572,8 @@ fi
|
||||
|
||||
enabled audio_beos && add_extralibs "-lmedia -lbe"
|
||||
|
||||
enabled mingw32 && add_extralibs -lws2_32
|
||||
|
||||
##########################################
|
||||
# imlib check
|
||||
|
||||
|
@ -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.
|
||||
|
@ -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 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
|
||||
# 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__
|
||||
|
Loading…
Reference in New Issue
Block a user