mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fts: Fix symbol redirect for fts_set [BZ #21289]

Browse Source 
In a 32-bit environment with _FILE_OFFSET_BITS=64, the __REDIRECT macro
combined with __THROW generates an invalid C++ declaration.

(cherry picked from commit ce39613205)
This commit is contained in:
Slava Barinov 2017-03-31 08:49:25 +02:00 committed by Florian Weimer
parent 27ab0d9518
commit f035c8d055
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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-20 Mike Frysinger <vapier@gentoo.org>
[BZ #21275]

5
NEWS
View File

@ -9,10 +9,11 @@ Version 2.25.1
The following bugs are resolved with this release:
[21109] Tunables broken on big-endian
[21115] sunrpc: Use-after-free in error path in clntudp_call
[20257] sunrpc: clntudp_call does not enforce timeout when receiving data
[21015] Document and fix --enable-bind-now
[21109] Tunables broken on big-endian
[21115] sunrpc: Use-after-free in error path in clntudp_call
[21289] Fix symbol redirect for fts_set
Version 2.25

2
io/fts.h
View File

@ -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