Commit 5322a29b authored by Gildas Bazin's avatar Gildas Bazin

* various little portability fixes
parent 2867bb65
......@@ -2,7 +2,7 @@
* audio_output.h : audio output thread interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: audio_output.h,v 1.44 2002/03/04 22:18:25 gbazin Exp $
* $Id: audio_output.h,v 1.45 2002/03/26 23:08:40 gbazin Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr>
......@@ -86,7 +86,7 @@ typedef struct aout_fifo_s
vlc_mutex_t data_lock;
vlc_cond_t data_wait;
void * buffer;
u8 * buffer;
mtime_t * date;
/* The start frame is the first frame in the buffer that contains decoded
......
......@@ -2,7 +2,7 @@
* vout_dummy.c: Dummy video output display method for testing purposes
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: vout_dummy.c,v 1.19 2002/03/16 23:03:19 sam Exp $
* $Id: vout_dummy.c,v 1.20 2002/03/26 23:08:40 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -47,6 +47,9 @@ typedef struct vout_sys_s
{
/* Nothing needed here. Maybe stats ? */
/* Prevent malloc(0) */
int i_dummy;
} vout_sys_t;
/*****************************************************************************
......
......@@ -2,7 +2,7 @@
* gtk_menu.h: prototypes for menu functions
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: gtk_menu.h,v 1.5 2001/11/11 18:15:42 sam Exp $
* $Id: gtk_menu.h,v 1.6 2002/03/26 23:08:40 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
......@@ -36,6 +36,6 @@ gint GtkSetupMenus( struct intf_thread_s * );
*****************************************************************************/
#define DATA2TITLE( user_data ) ( (gint)((long)(user_data)) >> 16 )
#define DATA2CHAPTER( user_data ) ( (gint)((long)(user_data)) & 0xffff )
#define POS2DATA( title, chapter ) ( NULL + ( ((title) << 16) \
| ((chapter) & 0xffff)) )
#define POS2DATA( title, chapter ) ( 0 + ( ((title) << 16) \
| ((chapter) & 0xffff)) )
......@@ -2,7 +2,7 @@
* spu_decoder.c : spu decoder thread
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: spu_decoder.c,v 1.13 2002/03/15 18:20:27 sam Exp $
* $Id: spu_decoder.c,v 1.14 2002/03/26 23:08:40 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -277,7 +277,7 @@ static void ParsePacket( spudec_thread_t *p_spudec )
/* Fill the p_spu structure */
p_spu->pf_render = RenderSPU;
p_spu->p_sys->p_data = (void*)p_spu->p_sys
p_spu->p_sys->p_data = (u8*)p_spu->p_sys
+ sizeof( struct subpicture_sys_s );
p_spu->p_sys->b_palette = 0;
......
......@@ -2,7 +2,7 @@
* rc.c : remote control stdin/stdout plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: rc.c,v 1.10 2002/02/15 13:32:53 sam Exp $
* $Id: rc.c,v 1.11 2002/03/26 23:08:40 gbazin Exp $
*
* Authors: Peter Surda <shurdeek@panorama.sth.ac.at>
*
......@@ -24,17 +24,23 @@
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <videolan/vlc.h>
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
#include <errno.h> /* ENOMEM */
#include <stdio.h>
#include <ctype.h>
#include <unistd.h>
#include <sys/time.h>
#include <sys/types.h>
#include <videolan/vlc.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
#include <sys/types.h>
#if defined( WIN32 )
#include <winsock2.h> /* select() */
......
......@@ -2,7 +2,7 @@
* aout_ext-dec.c : exported fifo management functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: aout_ext-dec.c,v 1.13 2002/02/24 22:06:50 sam Exp $
* $Id: aout_ext-dec.c,v 1.14 2002/03/26 23:08:40 gbazin Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr>
......@@ -139,7 +139,7 @@ aout_fifo_t * aout_CreateFifo( int i_format, int i_channels, int i_rate,
return( NULL );
}
p_fifo->buffer = (void *)p_fifo->date + sizeof(mtime_t)
p_fifo->buffer = (u8 *)p_fifo->date + sizeof(mtime_t)
* ( AOUT_FIFO_SIZE + 1 );
/* Set the fifo's buffer as empty (the first frame that is to be
......
......@@ -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.2 2002/03/02 03:53:55 xav Exp $
* $Id: input_ext-plugins.c,v 1.3 2002/03/26 23:08:40 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -25,7 +25,11 @@
* Preamble
*****************************************************************************/
#include <stdlib.h>
#include <sys/time.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
......
......@@ -2,7 +2,7 @@
* intf_eject.c: CD/DVD-ROM ejection handling functions
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: intf_eject.c,v 1.4 2002/01/12 02:02:44 jlj Exp $
* $Id: intf_eject.c,v 1.5 2002/03/26 23:08:40 gbazin Exp $
*
* Author: Julien Blache <jb@technologeek.org> for the Linux part
* with code taken from the Linux "eject" command
......@@ -22,12 +22,16 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#include <videolan/vlc.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <videolan/vlc.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <string.h>
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
......
......@@ -4,7 +4,7 @@
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: main.c,v 1.170 2002/03/25 20:37:00 lool Exp $
* $Id: main.c,v 1.171 2002/03/26 23:08:40 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -66,8 +66,6 @@
#include <errno.h> /* ENOMEM */
#include <stdlib.h> /* getenv(), strtol(), */
#include <string.h> /* strerror() */
#include <fcntl.h> /* open(), O_WRONLY */
#include <sys/stat.h> /* S_IREAD */
#include "netutils.h" /* network_ChannelJoin */
......
......@@ -2,7 +2,7 @@
* configuration.c management of the modules configuration
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: configuration.c,v 1.10 2002/03/26 22:30:09 gbazin Exp $
* $Id: configuration.c,v 1.11 2002/03/26 23:08:40 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -21,12 +21,15 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#include <videolan/vlc.h>
#include <stdio.h> /* sprintf() */
#include <stdlib.h> /* free(), strtol() */
#include <string.h> /* strdup() */
#include <unistd.h> /* getuid() */
#include <videolan/vlc.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h> /* getuid() */
#endif
#ifdef HAVE_GETOPT_LONG
# ifdef HAVE_GETOPT_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