* ./src/input/input.c: BeOS network support (no idea if it works when you

    don't have BONE, though).

diff --git a/configure b/configure
index 94da9c77414e245bfd470161ff5a13e08d5b2386..f4a29d25a5e5b158c4a0db8d8d1669c70d7b8205 100755 (executable)
--- a/configure
+++ b/configure
@@ -3110,7 +3110,7 @@ fi
     ;;
   xbeos)
     SYS=beos
-    LIB="${LIB} -lbe"
+    LIB="${LIB} -lbe -lbind"
     LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker"
     PLDFLAGS="${PLDFLAGS} -nostart"
     ;;

diff --git a/configure.in b/configure.in
index 6717e3f9d0384a1b379e165792c2ea8eb98dac3f..e93a66eb94eb80b724c43f8f645f3bc53c67f94c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -72,7 +72,7 @@ case x"${target_os}" in
     ;;
   xbeos)
     SYS=beos
-    LIB="${LIB} -lbe"
+    LIB="${LIB} -lbe -lbind"
     LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker"
     PLDFLAGS="${PLDFLAGS} -nostart"
     ;;

diff --git a/src/input/input.c b/src/input/input.c
index 3528231c12324546be1317d0147a6568b4d2cff7..1fe90fa61b1c04fa1096bc7525e3553d200726c3 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input.c,v 1.178 2002/02/26 17:22:12 xav Exp $
+ * $Id: input.c,v 1.179 2002/02/27 04:49:55 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -49,7 +49,9 @@
 #ifdef WIN32
 #   include <winsock2.h>
 #   include <ws2tcpip.h>
-#elif !defined( SYS_BEOS ) && !defined( SYS_NTO )
+#elif defined( SYS_NTO )
+    /* unsupported */
+#else
 #   include <netdb.h>                                         /* hostent ... */
 #   include <sys/socket.h>
 #   include <netinet/in.h>
@@ -86,7 +88,7 @@ static void EndThread       ( input_thread_t *p_input );
 static void FileOpen        ( input_thread_t *p_input );
 static void StdOpen         ( input_thread_t *p_input );
 static void FileClose       ( input_thread_t *p_input );
-#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
+#if !defined( SYS_NTO )
 static void NetworkOpen     ( input_thread_t *p_input );
 static void HTTPOpen        ( input_thread_t *p_input );
 static void NetworkClose    ( input_thread_t *p_input );
@@ -484,7 +486,7 @@ static int InitThread( input_thread_t * p_input )
     {
         f.pf_open( p_input );
     }
-#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
+#if !defined( SYS_NTO )
     /* FIXME : this is waaaay too kludgy */
     else if( ( strlen( p_input->p_source ) >= 10
                && !strncasecmp( p_input->p_source, "udpstream:", 10 ) )
@@ -600,7 +602,7 @@ static void CloseThread( input_thread_t * p_input )
     {
         f.pf_close( p_input );
     }
-#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
+#if !defined( SYS_NTO )
     /* Close stream */
     else if( ( strlen( p_input->p_source ) > 10
                && !strncasecmp( p_input->p_source, "udpstream:", 10 ) )
@@ -757,7 +759,7 @@ static void FileClose( input_thread_t * p_input )
     return;
 }
 
-#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
+#if !defined( SYS_NTO )
 /*****************************************************************************
  * NetworkOpen : open a network socket 
  *****************************************************************************/
@@ -1307,5 +1309,5 @@ static void HTTPOpen( input_thread_t * p_input )
     intf_WarnMsg( 3, "input: successfully opened HTTP mode" );
 }
 
-#endif /* !defined( SYS_BEOS ) && !defined( SYS_NTO ) */
+#endif /* !defined( SYS_NTO ) */
 

diff --git a/src/misc/netutils.c b/src/misc/netutils.c
index ad6b1a21877c51c07b6d95706784ba2ae12a3379..c7e1347aa261e52f1ece75c7149a858285c3a972 100644 (file)
--- a/src/misc/netutils.c
+++ b/src/misc/netutils.c
@@ -2,7 +2,7 @@
  * netutils.c: various network functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: netutils.c,v 1.57 2002/02/24 20:51:10 gbazin Exp $
+ * $Id: netutils.c,v 1.58 2002/02/27 04:49:55 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Benoit Steiner <benny@via.ecp.fr>
@@ -51,7 +51,7 @@
 
 #ifdef WIN32
 #   include <winsock2.h>
-#elif !defined( SYS_BEOS )
+#else
 #   include <netdb.h>                                         /* hostent ... */
 #   include <sys/socket.h>                           /* BSD: struct sockaddr */
 #   include <netinet/in.h>                            /* BSD: struct in_addr */
@@ -110,7 +110,7 @@ static int GetAdapterInfo  ( int i_adapter, char *psz_string );
 int network_BuildAddr( struct sockaddr_in * p_socket,
                        char * psz_address, int i_port )
 {
-#if defined( SYS_BEOS )
+#if 0
     intf_ErrMsg( "error: networking is not yet supported under BeOS" );
     return( 1 );