From 3129e03de2ac67b57b5dcf10f771e0dc03bb4647 Mon Sep 17 00:00:00 2001 From: Jon Lech Johansen Date: Thu, 8 Nov 2001 01:48:09 +0000 Subject: [PATCH] * Fixed some win32 64-bit issues. --- include/common.h | 6 ++++-- include/modules.h | 6 +----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/common.h b/include/common.h index 30e1ce30e8..ee74d12367 100644 --- a/include/common.h +++ b/include/common.h @@ -3,7 +3,7 @@ * Collection of useful common types and macros definitions ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: common.h,v 1.45 2001/11/07 22:58:13 jlj Exp $ + * $Id: common.h,v 1.46 2001/11/08 01:48:09 jlj Exp $ * * Authors: Samuel Hocevar * Vincent Seguin @@ -226,12 +226,14 @@ struct pgrm_descriptor_s; # define S_ISCHR(m) (0) # define S_ISFIFO(m) (((m)&_S_IFMT) == _S_IFIFO) # define S_ISREG(m) (((m)&_S_IFMT) == _S_IFREG) -# define I64C(x) x +# define I64C(x) x##i64 #else # define I64C(x) x##LL #endif #if defined( WIN32 ) +# define off_t __int64 +# define stat _stati64 # ifndef snprintf # define snprintf _snprintf /* snprintf not defined in mingw32 (bug?) */ # endif diff --git a/include/modules.h b/include/modules.h index fb29c6eba0..9acf2e2491 100644 --- a/include/modules.h +++ b/include/modules.h @@ -2,7 +2,7 @@ * modules.h : Module management functions. ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: modules.h,v 1.29 2001/09/05 16:07:49 massiot Exp $ + * $Id: modules.h,v 1.30 2001/11/08 01:48:09 jlj Exp $ * * Authors: Samuel Hocevar * @@ -21,10 +21,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ -#ifdef WIN32 -#include /* off_t */ -#endif - /***************************************************************************** * module_bank_t, p_module_bank (global variable) ***************************************************************************** -- 2.39.2