From b0e695cf79175ee62a263879d9b6f25399c9eda4 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 3 Aug 2012 01:19:58 +0200
Subject: Remove leftover BeOS support stuff

As by mplayer-svn commit 33972. Their BeOS removal was more thorough.
---
 Makefile            |  1 -
 configure           | 24 ------------------------
 osdep/shmem.c       |  2 --
 osdep/swab.c        | 33 ---------------------------------
 osdep/timer-linux.c |  3 ---
 5 files changed, 63 deletions(-)
 delete mode 100644 osdep/swab.c

diff --git a/Makefile b/Makefile
index 00eceda2a7..dd2c2973a1 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,6 @@ SRCS_COMMON-$(NEED_GLOB)             += osdep/glob-win.c
 SRCS_COMMON-$(NEED_SETENV)           += osdep/setenv.c
 SRCS_COMMON-$(NEED_SHMEM)            += osdep/shmem.c
 SRCS_COMMON-$(NEED_STRSEP)           += osdep/strsep.c
-SRCS_COMMON-$(NEED_SWAB)             += osdep/swab.c
 SRCS_COMMON-$(NEED_VSSCANF)          += osdep/vsscanf.c
 SRCS_COMMON-$(NETWORKING)            += stream/stream_netstream.c \
                                         stream/asf_mmst_streaming.c \
diff --git a/configure b/configure
index d28c64b227..2fd94366bd 100755
--- a/configure
+++ b/configure
@@ -1349,14 +1349,6 @@ fi #if x86
 ######################
 
 
-echocheck "-lposix"
-if cflag_check -lposix ; then
-  extra_ldflags="$extra_ldflags -lposix"
-  echores "yes"
-else
-  echores "no"
-fi
-
 echocheck "-lm"
 if cflag_check -lm ; then
   _ld_lm="-lm"
@@ -1460,7 +1452,6 @@ echores "$_nanosleep"
 
 echocheck "socklib"
 # for Solaris (socket stuff is in -lsocket, gethostbyname and friends in -lnsl):
-# for BeOS (socket stuff is in -lsocket, gethostbyname and friends in -lbind):
 cat > $TMPC << EOF
 #include <netdb.h>
 #include <sys/socket.h>
@@ -1883,19 +1874,6 @@ fi
 echores "$_vsscanf"
 
 
-echocheck "swab()"
-_swab=no
-define_statement_check "_XOPEN_SOURCE 600" "unistd.h" 'int a, b; swab(&a, &b, 0)' ||
-    statement_check "string.h" 'int a, b; swab(&a, &b, 0)' && _swab=yes
-if test "$_swab" = yes ; then
-  def_swab='#define HAVE_SWAB 1'
-  need_swab=no
-else
-  def_swab='#undef HAVE_SWAB'
-  need_swab=yes
-fi
-echores "$_swab"
-
 echocheck "POSIX select()"
 cat > $TMPC << EOF
 #include <stdio.h>
@@ -3982,7 +3960,6 @@ NEED_GETTIMEOFDAY = $need_gettimeofday
 NEED_GLOB         = $need_glob
 NEED_SHMEM        = $need_shmem
 NEED_STRSEP       = $need_strsep
-NEED_SWAB         = $need_swab
 NEED_VSSCANF      = $need_vsscanf
 
 # features
@@ -4180,7 +4157,6 @@ $def_select
 $def_setmode
 $def_shm
 $def_strsep
-$def_swab
 $def_sysi86
 $def_sysi86_iv
 $def_termcap
diff --git a/osdep/shmem.c b/osdep/shmem.c
index f1cec1be37..02140b5756 100644
--- a/osdep/shmem.c
+++ b/osdep/shmem.c
@@ -33,8 +33,6 @@
 #include <sys/uio.h>
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
-#elif defined(__BEOS__)
-#include <mman.h>
 #endif
 #include <sys/socket.h>
 #include <fcntl.h>
diff --git a/osdep/swab.c b/osdep/swab.c
deleted file mode 100644
index f0bb7964d8..0000000000
--- a/osdep/swab.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-/* system has no swab.  emulate via bswap */
-#include "mpbswap.h"
-#include <unistd.h>
-
-void swab(const void *from, void *to, ssize_t n) {
-  const int16_t *in = (int16_t*)from;
-  int16_t *out = (int16_t*)to;
-  int i;
-  n /= 2;
-  for (i = 0 ; i < n; i++) {
-    out[i] = bswap_16(in[i]);
-  }
-}
diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c
index 073ca84182..4ef28a499d 100644
--- a/osdep/timer-linux.c
+++ b/osdep/timer-linux.c
@@ -20,9 +20,6 @@
  */
 
 #include <unistd.h>
-#ifdef __BEOS__
-#define usleep(t) snooze(t)
-#endif
 #include <stdlib.h>
 #include <time.h>
 #include <sys/time.h>
-- 
cgit v1.2.3