about summary refs log tree commit diff
path: root/io
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:30:52 +0200
commitf035c8d055f25eaf6c93772f308afac10ce31ef2 (patch)
tree9088c60c51fc174f5342f92eff2a694b0300f26d /io
parent27ab0d9518746dfb59ed2ba59daefc981dc10e38 (diff)
downloadglibc-f035c8d055f25eaf6c93772f308afac10ce31ef2.tar.gz
glibc-f035c8d055f25eaf6c93772f308afac10ce31ef2.tar.xz
glibc-f035c8d055f25eaf6c93772f308afac10ce31ef2.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)
Diffstat (limited to 'io')
-rw-r--r--io/fts.h2
1 files changed, 1 insertions, 1 deletions
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