Commit e28bab12 authored by Xavier Marchesini's avatar Xavier Marchesini

 * Various Win32 compilation fixes.
 * DVD compiles, but doesn't work yet.
 * Fixed some typos in my previous Win32 multicast commit
parent b5231008
......@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: common.h,v 1.80 2002/03/01 00:33:17 massiot Exp $
* $Id: common.h,v 1.81 2002/03/02 03:53:54 xav Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -62,6 +62,12 @@ typedef int ptrdiff_t;
# endif
#endif
#ifndef _SSIZE_T
typedef s64 ssize_t;
#endif
/* Counter for statistics and profiling */
typedef unsigned long count_t;
......@@ -548,6 +554,7 @@ typedef struct module_symbols_s
size_t );
ssize_t ( * input_FDNetworkRead ) ( struct input_thread_s *, byte_t *,
size_t );
void * ( * input_BuffersInit )( void );
void ( * input_BuffersEnd )( struct input_buffers_s * );
struct data_buffer_s * ( * input_NewBuffer )( struct input_buffers_s *, size_t );
......
......@@ -3,7 +3,7 @@
* but exported to plug-ins
*****************************************************************************
* Copyright (C) 1999-2002 VideoLAN
* $Id: input_ext-plugins.h,v 1.19 2002/03/02 03:51:23 sam Exp $
* $Id: input_ext-plugins.h,v 1.20 2002/03/02 03:53:54 xav Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -321,7 +321,7 @@ typedef struct input_socket_s
#ifndef PLUGIN
void input_FDClose( struct input_thread_s * );
ssize_t input_FDRead( input_thread_t *, byte_t *, size_t );
int input_FDNetworkRead( input_thread_t *, byte_t *, size_t );
ssize_t input_FDNetworkRead( input_thread_t *, byte_t *, size_t );
void input_FDSeek( struct input_thread_s *, off_t );
#else
# define input_FDClose p_symbols->input_FDClose
......
......@@ -2,7 +2,7 @@
* ipv4.c: IPv4 network abstraction layer
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: ipv4.c,v 1.2 2002/03/01 01:59:18 xav Exp $
* $Id: ipv4.c,v 1.3 2002/03/02 03:53:55 xav Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -26,7 +26,6 @@
*****************************************************************************/
#include <stdlib.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <string.h>
#include <errno.h>
......@@ -225,7 +224,7 @@ static int OpenUDP( network_socket_t * p_socket )
/* Check if this is a multicast socket */
if (IN_MULTICAST( ntohl(psz_bind_address) ) )
if (IN_MULTICAST( ntohl( inet_addr(psz_bind_addr) ) ) )
{
psz_bind_win32 = NULL ;
}
......
......@@ -2,7 +2,7 @@
* input_ext-plugins.c: useful functions for access and demux plug-ins
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: input_ext-plugins.c,v 1.1 2002/03/01 00:33:18 massiot Exp $
* $Id: input_ext-plugins.c,v 1.2 2002/03/02 03:53:55 xav Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <string.h>
#include <errno.h>
......@@ -53,6 +52,20 @@
# endif
#endif
#ifdef WIN32
# include <winsock2.h>
# include <ws2tcpip.h>
#elif !defined( SYS_BEOS ) && !defined( SYS_NTO )
# include <netdb.h> /* hostent ... */
# include <sys/socket.h>
# include <netinet/in.h>
# ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> /* inet_ntoa(), inet_aton() */
# endif
#endif
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment