Update.

2001-11-05  Ulrich Drepper  <drepper@redhat.com>

	* io/fts.h: Prevent using <fts.h> with _FILE_OFFSET_BITS=64.

2001-11-04  Joseph S. Myers  <jsm28@cam.ac.uk>

	* manual/string.texi: Fix typos.
	* manual/examples/argp-ex2.c: Likewise.

	* sysdeps/unix/sysv/linux/s390/s390-32/register-dump.h (REGISTER_DUMP):
	* sysdeps/unix/sysv/linux/s390/s390-64/register-dump.h (REGISTER_DUMP):

diff --git a/ChangeLog b/ChangeLog
index a5b25f01b4f96e273de6d60a67f4931cc92fb62b..57de6dc7574c20ddf510ef72e1fce567b124ce9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-11-05  Ulrich Drepper  <drepper@redhat.com>
+
+       * io/fts.h: Prevent using <fts.h> with _FILE_OFFSET_BITS=64.
+
+2001-11-04  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+       * manual/string.texi: Fix typos.
+       * manual/examples/argp-ex2.c: Likewise.
+
 2001-11-05  Roland McGrath  <roland@frob.com>
 
        * sysdeps/powerpc/elf/sysdep.h: Remove this file, because it overrides
@@ -47,9 +56,9 @@
 
 2001-10-31  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
-       * sysdeps/unix/sysv/linux/s390/s390-32/register-dump (REGISTER_DUMP):
+       * sysdeps/unix/sysv/linux/s390/s390-32/register-dump.h (REGISTER_DUMP):
        Correct second argument of register_dump call.
-       * sysdeps/unix/sysv/linux/s390/s390-64/register-dump (REGISTER_DUMP):
+       * sysdeps/unix/sysv/linux/s390/s390-64/register-dump.h (REGISTER_DUMP):
        Likewise.
 
 2001-10-31  Ulrich Drepper  <drepper@redhat.com>

diff --git a/io/fts.h b/io/fts.h
index 2b500e0e4a42f3ff6c7306c8373dea8751eda640..a22c7bb9ca06089d77059e094f965683d7f6712c 100644 (file)
--- a/io/fts.h
+++ b/io/fts.h
@@ -35,6 +35,13 @@
 #include <features.h>
 #include <sys/types.h>
 
+/* The fts interface is incompatible with the LFS interface which
+   transparently uses the 64-bit file access functions.  */
+#ifdef __USE_FILE_OFFSET64
+# error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"
+#endif
+
+
 typedef struct {
        struct _ftsent *fts_cur;        /* current node */
        struct _ftsent *fts_child;      /* linked list of children */