* 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).

diff --git a/include/vlc_common.h b/include/vlc_common.h
index c13c41c4cfb2c0737e29ba910c29bc660f8c8ad4..ff9a16eb194db3b87340a83c6ddd3d2672bda9b1 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -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

diff --git a/modules/access/file.c b/modules/access/file.c
index 7170ae75f784da72aa5f3e029be8f6a4028da363..e75048d38e1d2700f34a04fe0f728038cf718b1c 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -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
  *****************************************************************************/