[vlc-devel] commit: Revert "Fix compilation for windows using mingw." it was not meant for committing either. (Jean-Paul Saman )

git version control git at videolan.org
Wed Oct 15 22:30:15 CEST 2008


vlc | branch: 0.9-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Tue Oct 14 17:11:09 2008 +0200| [4917f7f39a9bdba2e370c5d471710185c83704ad] | committer: Jean-Paul Saman 

Revert "Fix compilation for windows using mingw." it was not meant for committing either.

This reverts commit 9a8efe1072c5344d6db8c74f8c6ff50ade281765.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4917f7f39a9bdba2e370c5d471710185c83704ad
---

 modules/access/file.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/access/file.c b/modules/access/file.c
index 8cc4a9e..dcc35f6 100644
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -44,6 +44,9 @@
 #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>
@@ -53,10 +56,6 @@
 #   include <poll.h>
 #endif
 
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
-
 #if defined( WIN32 ) && !defined( UNDER_CE )
 #   ifdef lseek
 #      undef lseek
@@ -382,7 +381,7 @@ static int open_file (access_t *p_access, const char *path)
         return -1;
     }
 
-# if defined(HAVE_FCNTL_H) && !defined( WIN32 )
+# if defined(HAVE_FCNTL_H)
     fcntl (fd, F_SETFD, fcntl (fd, F_GETFD) | FD_CLOEXEC);
 
     /* We'd rather use any available memory for reading ahead




More information about the vlc-devel mailing list