diff mbox

Fix off_t typedef on Cygwin64

Message ID 20160829204154.11844-1-yselkowi@redhat.com
State New
Headers show

Commit Message

Yaakov Selkowitz Aug. 29, 2016, 8:41 p.m. UTC 
While both long and long long are 64-bits on x86_64, they are distinct types,
and long was used prior to commit 477463a2011ba81907a753df9ce7a71b6563db54.
Changing this breaks the linking of previously compiled C++ functions with
off_t arguments on 64-bit Cygwin with newly compiled code, as the mangling of
long (l) and long long (x) differ.

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

---
 newlib/libc/include/sys/_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.8.3
diff mbox

Patch

diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h
index 4bf2bc4..98b93ce 100644
--- a/newlib/libc/include/sys/_types.h
+++ b/newlib/libc/include/sys/_types.h
@@ -94,7 +94,7 @@  typedef __uint32_t __mode_t;
 __extension__ typedef long long _off64_t;
 #endif
 
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) && !defined(__LP64__)
 typedef _off64_t __off_t;
 #else
 typedef _off_t __off_t;