Commit 2dd2df69 authored by Gildas Bazin's avatar Gildas Bazin

* include/vlc_common.h: on win32 we include malloc.h (otherwise alloca is
   not declared).
* modules/access/file.c: use _lseeki64 instead of lseek on win32. This
   should allow seeking on files > 1.2Gb (Hopefully closes #168).
parent 1206810b
......@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vlc_common.h,v 1.56 2003/03/03 16:49:14 gbazin Exp $
* $Id: vlc_common.h,v 1.57 2003/03/04 21:12:04 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -101,6 +101,10 @@ typedef int ptrdiff_t;
# endif
#endif
#if defined( WIN32 )
# include <malloc.h>
#endif
#if defined( WIN32 ) || defined( UNDER_CE )
typedef int ssize_t;
#endif
......@@ -610,11 +614,6 @@ typedef __int64 off_t;
# define off_t unsigned __int64
# endif
# ifdef lseek
# undef lseek
# define lseek _lseeki64
# endif
# ifndef O_NONBLOCK
# define O_NONBLOCK 0
# endif
......
......@@ -2,7 +2,7 @@
* file.c: file input (file: access plug-in)
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: file.c,v 1.12 2003/03/03 14:21:08 gbazin Exp $
* $Id: file.c,v 1.13 2003/03/04 21:12:04 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -48,6 +48,12 @@
# include <io.h>
#endif
#if defined( WIN32 ) && !defined( UNDER_CE )
# ifdef lseek
# undef lseek
# endif
# define lseek _lseeki64
#endif
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
......
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