aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlava Barinov <v.barinov@samsung.com>2017-03-31 08:49:25 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-03-31 09:11:16 +0200
commitce39613205dc47ceaeea76710d49e7a483b503ab (patch)
tree7f92d6f12d42732da5054e494f798a53e9eb5c1b
parent2183741fdcc0377e3a4f917194799e576537967f (diff)
downloadglibc-ce39613205dc47ceaeea76710d49e7a483b503ab.tar
glibc-ce39613205dc47ceaeea76710d49e7a483b503ab.tar.gz
glibc-ce39613205dc47ceaeea76710d49e7a483b503ab.tar.bz2
glibc-ce39613205dc47ceaeea76710d49e7a483b503ab.zip
fts: Fix symbol redirect for fts_set [BZ #21289]
In a 32-bit environment with _FILE_OFFSET_BITS=64, the __REDIRECT macro combined with __THROW generates an invalid C++ declaration.
-rw-r--r--ChangeLog5
-rw-r--r--io/fts.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bddadc6aa4..3a393a015d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-31 Slava Barinov <v.barinov@samsung.com>
+
+ [BZ #21289]
+ * io/fts.h (fts_set): Replace __REDIRECT with __REDIRECT_NTH.
+
2017-03-30 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/unix/sysv/linux/test-errno-linux.c (do_test): Handle
diff --git a/io/fts.h b/io/fts.h
index b9cff534e9..ab15567001 100644
--- a/io/fts.h
+++ b/io/fts.h
@@ -193,7 +193,7 @@ FTS *__REDIRECT (fts_open, (char * const *, int,
int (*)(const FTSENT **, const FTSENT **)),
fts64_open);
FTSENT *__REDIRECT (fts_read, (FTS *), fts64_read);
-int __REDIRECT (fts_set, (FTS *, FTSENT *, int), fts64_set) __THROW;
+int __REDIRECT_NTH (fts_set, (FTS *, FTSENT *, int), fts64_set);
# else
# define fts_children fts64_children
# define fts_close fts64_close