[ARM,MIPS,M68K] fallocate prototype fixes

View: New views
2 Messages — Rating Filter:   Alert me  

[ARM,MIPS,M68K] fallocate prototype fixes

by Joseph S. Myers :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

This patch makes the fallocate prototype fixes for _FILE_OFFSET_BITS=64
for ARM, MIPS and M68K corresponding to the recent libc changes
<http://sourceware.org/ml/libc-hacker/2009-11/msg00001.html>.  I've
committed the ARM and MIPS changes; OK to commit the M68K ones?

Other port maintainers may also wish to fix their ports.

diff --git a/ChangeLog.arm b/ChangeLog.arm
index d784564..58bfada 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,8 @@
+2009-11-06  Joseph Myers  <joseph@...>
+
+ * sysdeps/unix/sysv/linux/arm/bits/fcntl.h (fallocate): Fix types
+ of last two arguments when -D_FILE_OFFSET_BITS=64.
+
 2009-11-04  Philip Blundell  <philb@...>
 
  * sysdeps/unix/sysv/linux/arm/clone.S: Support V4T interworking.
diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index 59be68c..c97c91a 100644
--- a/ChangeLog.m68k
+++ b/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2009-11-06  Joseph Myers  <joseph@...>
+
+ * sysdeps/unix/sysv/linux/m68k/bits/fcntl.h (fallocate): Fix types
+ of last two arguments when -D_FILE_OFFSET_BITS=64.
+
 2009-10-30  Joseph Myers  <joseph@...>
 
  [BZ #10609]
diff --git a/ChangeLog.mips b/ChangeLog.mips
index d4afc96..e7a0518 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,8 @@
+2009-11-06  Joseph Myers  <joseph@...>
+
+ * sysdeps/unix/sysv/linux/mips/bits/fcntl.h (fallocate): Fix types
+ of last two arguments when -D_FILE_OFFSET_BITS=64.
+
 2009-10-29  Joseph Myers  <joseph@...>
 
  * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Define F_OWNER_* and
diff --git a/sysdeps/unix/sysv/linux/arm/bits/fcntl.h b/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
index e5e70aa..6388904 100644
--- a/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
@@ -259,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-   __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+   __off64_t __len),
        fallocate64);
 #  else
 #   define fallocate fallocate64
diff --git a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
index 1e396dc..3d9ef2e 100644
--- a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
@@ -239,8 +239,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-   __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+   __off64_t __len),
        fallocate64);
 #  else
 #   define fallocate fallocate64
diff --git a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
index e451696..88f752d 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
@@ -272,8 +272,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-   __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+   __off64_t __len),
        fallocate64);
 #  else
 #   define fallocate fallocate64

--
Joseph S. Myers
joseph@...

Re: [ARM,MIPS,M68K] fallocate prototype fixes

by Andreas Schwab-2 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

"Joseph S. Myers" <joseph@...> writes:

> This patch makes the fallocate prototype fixes for _FILE_OFFSET_BITS=64
> for ARM, MIPS and M68K corresponding to the recent libc changes
> <http://sourceware.org/ml/libc-hacker/2009-11/msg00001.html>.  I've
> committed the ARM and MIPS changes; OK to commit the M68K ones?

Yes.

Andreas.

--
Andreas Schwab, schwab@...
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."