[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26514 - intermittent updater failures on Win64 (Error 19)

[gk at torproject.org]

commit c2720b2274e51eb76b91e5f6a5f2a82bdfaf8013
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Mon Aug 13 12:13:40 2018 -0400

    Bug 26514 - intermittent updater failures on Win64 (Error 19)
    
    Avoid MinGW's _ftelli64() and _fseeki64() implementations because they
    are unreliable.
---
 modules/libmar/src/mar_private.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/libmar/src/mar_private.h b/modules/libmar/src/mar_private.h
index e0c263271ed0..358026fbcf50 100644
--- a/modules/libmar/src/mar_private.h
+++ b/modules/libmar/src/mar_private.h
@@ -55,8 +55,15 @@ MOZ_STATIC_ASSERT(sizeof(BLOCKSIZE) < \
    instead of the NSPR equivalents. */
 #ifdef XP_WIN
 #include <winsock2.h>
+#ifdef __MINGW32__
+/* Avoid MinGW's _ftelli64() and _fseeki64() implementations because they
+ * are unreliable. See bug #26514. */
+#define ftello ftello64
+#define fseeko fseeko64
+#else
 #define ftello _ftelli64
 #define fseeko _fseeki64
+#endif
 #else
 #define _FILE_OFFSET_BITS 64
 #include <netinet/in.h>