diff options
| author | Slava Barinov <v.barinov@samsung.com> | 2017-03-31 08:49:25 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-03-31 10:02:53 +0200 |
| commit | 8cc27927431a70c361b8cdddab074878d054a306 (patch) | |
| tree | 9498ff4c6eebb3ef531d8b21605f2f77c4195c2a | |
| parent | 7043946c7921c0e3850dd2b3d948336624bb0f62 (diff) | |
| download | glibc-8cc27927431a70c361b8cdddab074878d054a306.tar.gz glibc-8cc27927431a70c361b8cdddab074878d054a306.tar.xz glibc-8cc27927431a70c361b8cdddab074878d054a306.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. (cherry picked from commit ce39613205dc47ceaeea76710d49e7a483b503ab)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | io/fts.h | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 3a62ca6335..dfa9537d90 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-20 Mike Frysinger <vapier@gentoo.org> [BZ #21275] diff --git a/NEWS b/NEWS index 0d5e14e307..71b41ea625 100644 --- a/NEWS +++ b/NEWS @@ -21,6 +21,9 @@ Security related changes: question type which is outside the range of valid question type values. (CVE-2015-5180) +The following bugs are resolved with this release: + + [21289] Fix symbol redirect for fts_set Version 2.24 diff --git a/io/fts.h b/io/fts.h index 127a0d2721..b6b45206c8 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 |