From: Slava Barinov Date: Fri, 31 Mar 2017 06:49:25 +0000 (+0200) Subject: fts: Fix symbol redirect for fts_set [BZ #21289] X-Git-Tag: glibc-2.26~662 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=ce39613205dc47ceaeea76710d49e7a483b503ab;p=glibc.git 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. --- diff --git a/ChangeLog b/ChangeLog index bddadc6aa4..3a393a015d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-03-31 Slava Barinov + + [BZ #21289] + * io/fts.h (fts_set): Replace __REDIRECT with __REDIRECT_NTH. + 2017-03-30 Adhemerval Zanella * 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