aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Revol <revol@free.fr>2007-03-23 22:01:37 +0000
committerFrançois Revol <revol@free.fr>2007-03-23 22:01:37 +0000
commitc9fdab0dabdf82546ff01f4903f15a615c5e25ca (patch)
tree5f0f40b93f459b2be1ee31995f9215d61e83fc5f
parent56cc42664a23bc15c1d581a5ad30098ac188369e (diff)
downloadffmpeg-c9fdab0dabdf82546ff01f4903f15a615c5e25ca.tar.gz
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
-rwxr-xr-xconfigure3
-rw-r--r--libavformat/barpainet.h44
-rw-r--r--libavformat/network.h7
-rw-r--r--libavformat/os_support.c2
4 files changed, 11 insertions, 45 deletions
diff --git a/configure b/configure
index 7d9d03b8be..39a570bd22 100755
--- a/configure
+++ b/configure
@@ -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"
diff --git a/libavformat/barpainet.h b/libavformat/barpainet.h
deleted file mode 100644
index c79855c2f7..0000000000
--- a/libavformat/barpainet.h
+++ /dev/null
@@ -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 */
diff --git a/libavformat/network.h b/libavformat/network.h
index b67b9b1364..3aa8ba8367 100644
--- a/libavformat/network.h
+++ b/libavformat/network.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
diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 795fab884b..7a4be8fa75 100644
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -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)
{