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

Some more BeOS cleanup: check for arpa/inet.h; declare the prototype for inet_aton if not found; remove barpainet.h as it's not longer needed.

Browse Source 
Originally committed as revision 8488 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
François Revol 2007-03-23 22:01:37 +00:00
parent 56cc42664a
commit c9fdab0dab
4 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -590,6 +590,7 @@ HAVE_LIST="
altivec_h
armv5te
armv6
arpa_inet_h
byteswap_h
cmov
dcbzl
@ -1509,6 +1510,8 @@ fi
check_header byteswap.h
check_header arpa/inet.h
check_func inet_aton
check_func localtime_r
enabled zlib && check_lib zlib.h zlibVersion -lz || zlib="no"

44
libavformat/barpainet.h
View File

@ -1,44 +0,0 @@
/*
* copyright (c) 2002 Francois Revol
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef BARPA_INET_H
#define BARPA_INET_H
#include "config.h"
#ifdef CONFIG_BEOS_NETSERVER
# include <socket.h>
int inet_aton (const char * str, struct in_addr * add);
# define SO_SNDBUF 0x40000001
/* fake */
struct ip_mreq {
struct in_addr imr_multiaddr; /* IP multicast address of group */
struct in_addr imr_interface; /* local IP address of interface */
};
#include <netdb.h>
#else
# include <arpa/inet.h>
#endif
#endif /* BARPA_INET_H */

7
libavformat/network.h
View File

@ -24,7 +24,14 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#include <netdb.h>
#if !defined(HAVE_INET_ATON)
/* in os_support.c */
int inet_aton (const char * str, struct in_addr * add);
#endif
#endif

2
libavformat/os_support.c
View File

@ -78,7 +78,7 @@ struct tm *localtime_r(const time_t *t, struct tm *tp)
#if !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK)
#include <stdlib.h>
#include <strings.h>
#include "barpainet.h"
#include "network.h"
int inet_aton (const char * str, struct in_addr * add)
{