virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

The long awaited BeOS cleanup, phase 1

Browse Source 
Originally committed as revision 7581 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
François Revol 2007-01-18 17:22:30 +00:00
parent 453cd7a496
commit e9d511dc7e
8 changed files with 34 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/http.c
View File

@ -23,11 +23,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <arpa/inet.h>
#include <netdb.h>
#include "base64.h"

27
libavformat/os_support.h
View File

@ -26,12 +26,18 @@
* @file os_support.h
* miscellaneous OS support macros and functions.
*
* - socklen_t typedef (BeOS, Innotek libc)
* - usleep() (Win32, BeOS, OS/2)
* - lseek() (Win32)
* - floatf() (OS/2)
* - strcasecmp() (OS/2)
* - closesocket()
*/
#if defined(__BEOS__) || defined(__INNOTEK_LIBC__)
typedef int socklen_t;
#endif
#ifdef __MINGW32__
__declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
// # include <windows.h>
@ -40,9 +46,23 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
# define lseek(f,p,w) _lseeki64((f), (p), (w))
#endif
/* XXX: check for Winsock here */
#if 0
#define HAVE_CLOSESOCKET 1
#endif
#ifdef __BEOS__
# ifndef usleep
# include <sys/socket.h>
# include <netinet/in.h>
/* not net_server ? */
# if IPPROTO_TCP != 6
# define HAVE_CLOSESOCKET 1
# endif
# include <BeBuild.h>
/* R5 didn't have usleep, fake it. Haiku and Zeta has it now. */
# if B_BEOS_VERSION <= B_BEOS_VERSION_5
# include <OS.h>
/* doesn't set errno but that's enough */
# define usleep(t) snooze((bigtime_t)(t))
# endif
#endif
@ -53,4 +73,9 @@ static inline int usleep(unsigned int t) { return _sleep2(t / 1000); }
static inline int strcasecmp(const char* s1, const char* s2) { return stricmp(s1,s2); }
#endif
/* most of the time closing a socket is just closing an fd */
#if HAVE_CLOSESOCKET != 1
#define closesocket close
#endif
#endif /* _OS_SUPPORT_H */

6
libavformat/rtp.c
View File

@ -26,11 +26,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <arpa/inet.h>
#include <netdb.h>
#include "rtp_internal.h"

6
libavformat/rtp_h264.c
View File

@ -45,11 +45,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <assert.h>
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <arpa/inet.h>
#include <netdb.h>
#include "rtp_internal.h"

6
libavformat/rtpproto.c
View File

@ -25,11 +25,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <arpa/inet.h>
#include <netdb.h>
#include <fcntl.h>

6
libavformat/rtsp.c
View File

@ -24,11 +24,7 @@
#include <sys/time.h>
#include <netinet/in.h>
#include <sys/socket.h>
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <arpa/inet.h>
#include "rtp_internal.h"

13
libavformat/tcp.c
View File

@ -23,14 +23,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#if defined(__BEOS__) || defined(__INNOTEK_LIBC__)
typedef int socklen_t;
#endif
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <netdb.h>
#include <sys/time.h>
#include <fcntl.h>
@ -127,7 +120,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
ret = AVERROR_IO;
fail1:
if (fd >= 0)
close(fd);
closesocket(fd);
av_free(s);
return ret;
}
@ -213,11 +206,7 @@ static int tcp_write(URLContext *h, uint8_t *buf, int size)
static int tcp_close(URLContext *h)
{
TCPContext *s = h->priv_data;
#ifdef CONFIG_BEOS_NETSERVER
closesocket(s->fd);
#else
close(s->fd);
#endif
av_free(s);
return 0;
}

18
libavformat/udp.c
View File

@ -23,11 +23,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <netdb.h>
#ifndef IPV6_ADD_MEMBERSHIP
@ -214,11 +210,7 @@ static int udp_ipv6_set_local(URLContext *h) {
fail:
if (udp_fd >= 0)
#ifdef CONFIG_BEOS_NETSERVER
closesocket(udp_fd);
#else
close(udp_fd);
#endif
if(res0)
freeaddrinfo(res0);
return -1;
@ -421,11 +413,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
return 0;
fail:
if (udp_fd >= 0)
#ifdef CONFIG_BEOS_NETSERVER
closesocket(udp_fd);
#else
close(udp_fd);
#endif
av_free(s);
return AVERROR_IO;
}
@ -482,22 +470,20 @@ static int udp_close(URLContext *h)
{
UDPContext *s = h->priv_data;
#ifndef CONFIG_BEOS_NETSERVER
#ifndef CONFIG_IPV6
#ifdef IP_DROP_MEMBERSHIP
if (s->is_multicast && !(h->flags & URL_WRONLY)) {
if (setsockopt(s->udp_fd, IPPROTO_IP, IP_DROP_MEMBERSHIP,
&s->mreq, sizeof(s->mreq)) < 0) {
perror("IP_DROP_MEMBERSHIP");
}
}
#endif
#else
if (s->is_multicast && !(h->flags & URL_WRONLY))
udp_ipv6_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr);
#endif
close(s->udp_fd);
#else
closesocket(s->udp_fd);
#endif
av_free(s);
return 0;
}