[vlc-commits] commit: Fix win* compilation and cosmetics (Jean-Baptiste Kempf )

git at videolan.org git at videolan.org
Sun Jan 9 19:14:13 CET 2011


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jan  9 19:13:41 2011 +0100| [bdde76dfb31f0703330662291839409d4f4e38bc] | committer: Jean-Baptiste Kempf 

Fix win* compilation and cosmetics

Sorry for the mistake

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

 src/misc/block.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/misc/block.c b/src/misc/block.c
index 78f05ff..9a463dd 100644
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -363,9 +363,9 @@ block_t *block_mmap_Alloc (void *addr, size_t length)
 
 #ifdef WIN32
 # include <io.h>
-#ifdef UNDER_CE
-#define _get_osfhandle(a) ((long) (a))
-#endif
+# ifdef UNDER_CE
+#  define _get_osfhandle(a) ((long) (a))
+# endif
 
 static
 ssize_t pread (int fd, void *buf, size_t count, off_t offset)
@@ -383,9 +383,7 @@ ssize_t pread (int fd, void *buf, size_t count, off_t offset)
         return written;
     return -1;
 }
-#endif
-
-#ifndef HAVE_PREAD
+#elif !defined( HAVE_PREAD )
 static
 ssize_t pread(int fd, const void * buf, size_t size, off_t offset) {
     off_t offs0;



More information about the vlc-commits mailing list