2.3.4-16

diff --git a/ChangeLog b/ChangeLog
index 1bd2b68cb62705b8ee5b9185c5e3d1dac35b2918..07a887f5e46fef9139dc244504f86b30e2f923fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-20  Jakub Jelinek  <jakub@redhat.com>
+
+       * posix/bits/unistd.h (pread) [__USE_FILE_OFFSET64]: Use __off64_t
+       instead of __off_t for last argument.
+       * debug/Makefile (tests): Add tst-lfschk{1,2,3}.
+       * debug/tst-lfschk1.c: New test.
+       * debug/tst-lfschk2.c: New test.
+       * debug/tst-lfschk3.c: New test.
+
 2005-03-19  Ulrich Drepper  <drepper@redhat.com>
 
        * inet/test-ifaddrs.c: Use test-skeleton.

diff --git a/debug/Makefile b/debug/Makefile
index c904913c358fa2304662bb0be297cb1c8175220a..42e64ad16f27874d80f10c27ea56e63ca34a167d 100644 (file)
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -54,7 +54,7 @@ CFLAGS-recv_chk.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-recvfrom_chk.c = -fexceptions -fasynchronous-unwind-tables
 
 tests = backtrace-tst tst-chk1 tst-chk2 tst-chk3 \
-       test-strcpy_chk test-stpcpy_chk
+       tst-lfschk1 tst-lfschk2 tst-lfschk3 test-strcpy_chk test-stpcpy_chk
 
 extra-libs = libSegFault libpcprofile
 extra-libs-others = $(extra-libs)

diff --git a/debug/tst-lfschk1.c b/debug/tst-lfschk1.c
new file mode 100644 (file)
index 0000000..f3e6d47
--- /dev/null
+++ b/debug/tst-lfschk1.c
@@ -0,0 +1,2 @@
+#define _FILE_OFFSET_BITS 64
+#include "tst-chk1.c"

diff --git a/debug/tst-lfschk2.c b/debug/tst-lfschk2.c
new file mode 100644 (file)
index 0000000..95d4db1
--- /dev/null
+++ b/debug/tst-lfschk2.c
@@ -0,0 +1,2 @@
+#define _FILE_OFFSET_BITS 64
+#include "tst-chk2.c"

diff --git a/debug/tst-lfschk3.c b/debug/tst-lfschk3.c
new file mode 100644 (file)
index 0000000..50a1ae1
--- /dev/null
+++ b/debug/tst-lfschk3.c
@@ -0,0 +1,2 @@
+#define _FILE_OFFSET_BITS 64
+#include "tst-chk3.c"

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 3b62b41830523bbf5db35ff0bfae0e405ff31560..d6fcab7080a8845c72bcccc0b68445a73d0bd9fe 100644 (file)
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 15
+%define glibcrelease 16
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@@ -1275,6 +1275,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Sun Mar 20 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-16
+- fix pread with -D_FILE_OFFSET_BITS=64 (#151573)
+
 * Sat Mar 19 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-15
 - update from CVS
   - better fix for the dlclose bug (#145810, #150414)

diff --git a/posix/bits/unistd.h b/posix/bits/unistd.h
index 988f0167ed32f601132ffd7ced9a069686aa47f5..9c82c7eaf59693679d12be3f4f50a7bf338dc335 100644 (file)
--- a/posix/bits/unistd.h
+++ b/posix/bits/unistd.h
@@ -51,7 +51,7 @@ pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset)
 }
 # else
 extern __always_inline __wur ssize_t
-pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset)
+pread (int __fd, void *__buf, size_t __nbytes, __off64_t __offset)
 {
   if (__bos0 (__buf) != (size_t) -1 && __nbytes > __bos0 (__buf))
     __chk_fail ();