[vlc-devel] commit: Fix compilation for windows using mingw. (Jean-Paul Saman )
Jean-Paul Saman
jpsaman at videolan.org
Tue Oct 14 17:21:18 CEST 2008
git version control wrote:
> vlc | branch: 0.9-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Mon Oct 13 14:41:33 2008 +0200| [9a8efe1072c5344d6db8c74f8c6ff50ade281765] | committer: Jean-Paul Saman
>
> Fix compilation for windows using mingw.
>
This fix was not meant for submitting upstream. I accidently pushed my
0.9-bugfix branch too. It will be reverted shortly.
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9a8efe1072c5344d6db8c74f8c6ff50ade281765
> ---
>
> modules/access/file.c | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/modules/access/file.c b/modules/access/file.c
> index dcc35f6..8cc4a9e 100644
> --- a/modules/access/file.c
> +++ b/modules/access/file.c
> @@ -44,9 +44,6 @@
> #ifdef HAVE_SYS_STAT_H
> # include <sys/stat.h>
> #endif
> -#ifdef HAVE_FCNTL_H
> -# include <fcntl.h>
> -#endif
>
> #if defined( WIN32 ) && !defined( UNDER_CE )
> # include <io.h>
> @@ -56,6 +53,10 @@
> # include <poll.h>
> #endif
>
> +#ifdef HAVE_FCNTL_H
> +# include <fcntl.h>
> +#endif
> +
> #if defined( WIN32 ) && !defined( UNDER_CE )
> # ifdef lseek
> # undef lseek
> @@ -381,7 +382,7 @@ static int open_file (access_t *p_access, const char *path)
> return -1;
> }
>
> -# if defined(HAVE_FCNTL_H)
> +# if defined(HAVE_FCNTL_H) && !defined( WIN32 )
> fcntl (fd, F_SETFD, fcntl (fd, F_GETFD) | FD_CLOEXEC);
>
> /* We'd rather use any available memory for reading ahead
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> http://mailman.videolan.org/listinfo/vlc-devel
>
More information about the vlc-devel
mailing list