diff tcp.c @ 1670:92afee454599 libavformat

The long awaited BeOS cleanup, phase 1
author mmu_man
date Thu, 18 Jan 2007 17:22:30 +0000
parents 0899bfe4105c
children 818eafa8fc95
line wrap: on
line diff
--- a/tcp.c	Thu Jan 18 15:42:25 2007 +0000
+++ b/tcp.c	Thu Jan 18 17:22:30 2007 +0000
@@ -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 @@
     ret = AVERROR_IO;
  fail1:
     if (fd >= 0)
-        close(fd);
+        closesocket(fd);
     av_free(s);
     return ret;
 }
@@ -213,11 +206,7 @@
 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;
 }