64 lines
1.9 KiB
Diff
64 lines
1.9 KiB
Diff
From f035c8d055f25eaf6c93772f308afac10ce31ef2 Mon Sep 17 00:00:00 2001
|
||
From: Slava Barinov <v.barinov@samsung.com>
|
||
Date: Fri, 31 Mar 2017 08:49:25 +0200
|
||
Subject: [PATCH 08] 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)
|
||
---
|
||
ChangeLog | 5 +++++
|
||
NEWS | 5 +++--
|
||
io/fts.h | 2 +-
|
||
3 files changed, 9 insertions(+), 3 deletions(-)
|
||
|
||
diff --git a/ChangeLog b/ChangeLog
|
||
index ef5388c..85d6fc6 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 9bf8c10..fee1cf8 100644
|
||
--- a/NEWS
|
||
+++ b/NEWS
|
||
@@ -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
|
||
|
||
diff --git a/io/fts.h b/io/fts.h
|
||
index b9cff53..ab15567 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
|
||
--
|
||
2.7.4.GIT
|
||
|
||
|