Commit c9fdab0d authored by François Revol's avatar François Revol
Browse files

Some more BeOS cleanup: check for arpa/inet.h; declare the prototype for...

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.

Originally committed as revision 8488 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 56cc4266
......@@ -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"
......
/*
* 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 */
......@@ -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
......@@ -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)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment