The long awaited BeOS cleanup, phase 1

Originally committed as revision 7581 to svn://svn.ffmpeg.org/ffmpeg/trunk

8 files changed, 34 insertions, 54 deletions

diff --git a/libavformat/http.c b/libavformat/http.c
index f150f6684c..0a588871bb 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -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"
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 88d07ef50c..6f915351fe 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -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 */
diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index 37a2862892..0ac0a7d213 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -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"
diff --git a/libavformat/rtp_h264.c b/libavformat/rtp_h264.c
index 2568e9ea57..68066aaca0 100644
--- a/libavformat/rtp_h264.c
+++ b/libavformat/rtp_h264.c
@@ -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"
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index d31c509c22..14850c48c1 100644
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -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>
 
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 787cdd6851..2bc6bb249a 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -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"
 
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index 93755c4978..9544773111 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -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;
 }
diff --git a/libavformat/udp.c b/libavformat/udp.c
index 96fa4e152c..3a309c610a 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -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;
 }