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 bddadc6aa474d83e0a0b4ee1d4f6b6650a9f39b7..3a393a015d1919991147be7b3cbcd069e566f125 100644 (file)
--- 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-30  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
        * sysdeps/unix/sysv/linux/test-errno-linux.c (do_test): Handle

diff --git a/io/fts.h b/io/fts.h
index b9cff534e9b2f78c591b9e556bae51dfc3d05f92..ab1556700189b84a1c11f46b02256d0e539370ab 100644 (file)
--- 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