commit c9cce4b981c79d543d2d10d2365e81fb39ad3da9
author Rom Lemarchand <romlem@google.com> Fri Jun 28 09:45:08 2013 -0700
committer Rom Lemarchand <romlem@google.com> Fri Jun 28 17:00:41 2013 -0700
tree 130026115d3be9077a51f34e025302a1bbf4018b
parent 1d932e2bc6f09705320804215149ec072bdf9805

fastboot: Remove legacy MINGW workarounds

The version of MINGW we compile with has more advanced POSIX support.
Removing legacy MINGW workarounds as those are not needed anymore.

Change-Id: Id5d67176b719db6c3667be6d63c41432e0ba9f30
Signed-off-by: Rom Lemarchand <romlem@google.com>

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 447b257..e469d97 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -135,21 +135,17 @@
     return strdup(path);
 }
 
-#ifdef _WIN32
-void *load_file(const char *fn, unsigned *_sz);
-int64_t file_size(const char *fn);
-#else
 #if defined(__APPLE__) && defined(__MACH__)
 #define lseek64 lseek
 #define off64_t off_t
 #endif
 
-int64_t file_size(const char *fn)
+static int64_t file_size(const char *fn)
 {
     off64_t off;
     int fd;
 
-    fd = open(fn, O_RDONLY);
+    fd = open(fn, O_RDONLY | O_BINARY);
     if (fd < 0) return -1;
 
     off = lseek64(fd, 0, SEEK_END);
@@ -158,7 +154,7 @@
     return off;
 }
 
-void *load_file(const char *fn, unsigned *_sz)
+static void *load_file(const char *fn, unsigned *_sz)
 {
     char *data;
     int sz;
@@ -166,7 +162,7 @@
     int errno_tmp;
 
     data = 0;
-    fd = open(fn, O_RDONLY);
+    fd = open(fn, O_RDONLY | O_BINARY);
     if(fd < 0) return 0;
 
     sz = lseek(fd, 0, SEEK_END);
@@ -190,7 +186,6 @@
     errno = errno_tmp;
     return 0;
 }
-#endif
 
 int match_fastboot_with_serial(usb_ifc_info *info, const char *local_serial)
 {