[Ffmpeg-cvslog] r8488 - in trunk: configure libavformat/barpainet.h libavformat/network.h libavformat/os_support.c

[mmu_man]

Author: mmu_man
Date: Fri Mar 23 23:01:37 2007
New Revision: 8488

Removed:
   trunk/libavformat/barpainet.h
Modified:
   trunk/configure
   trunk/libavformat/network.h
   trunk/libavformat/os_support.c

Log:
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.

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Fri Mar 23 23:01:37 2007
@@ -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"

Modified: trunk/libavformat/network.h
==============================================================================
--- trunk/libavformat/network.h	(original)
+++ trunk/libavformat/network.h	Fri Mar 23 23:01:37 2007
@@ -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

Modified: trunk/libavformat/os_support.c
==============================================================================
--- trunk/libavformat/os_support.c	(original)
+++ trunk/libavformat/os_support.c	Fri Mar 23 23:01:37 2007
@@ -78,7 +78,7 @@ struct tm *localtime_r(const time_t *t, 
 #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)
 {