system/glibc
3
0
Fork 0
Code Issues 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.
This commit is contained in:
Slava Barinov 2017-03-31 08:49:25 +02:00 committed by Florian Weimer
parent 2183741fdc
commit ce39613205
2 changed files with 6 additions and 1 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-30 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2017-03-30 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/unix/sysv/linux/test-errno-linux.c (do_test): Handle * sysdeps/unix/sysv/linux/test-errno-linux.c (do_test): Handle

2
io/fts.h
View File

@ -193,7 +193,7 @@ FTS *__REDIRECT (fts_open, (char * const *, int,
int (*)(const FTSENT **, const FTSENT **)), int (*)(const FTSENT **, const FTSENT **)),
fts64_open); fts64_open);
FTSENT *__REDIRECT (fts_read, (FTS *), fts64_read); 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 # else
# define fts_children fts64_children # define fts_children fts64_children
# define fts_close fts64_close # define fts_close fts64_close