diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2021-07-30 12:56:24 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-07-31 12:00:34 -0700 |
commit | 786bb6fb17d698eb175942606db8fb129e231474 (patch) | |
tree | 531d2f0f261eb9540f454a650ee78a8915139a51 /lib/fts_.h | |
parent | c44470fb95020b371e31202bf2884ca021b3dd73 (diff) | |
download | gnulib-786bb6fb17d698eb175942606db8fb129e231474.tar.gz |
gnulib-common: update for C2x 2020-12-11 draft
Use blessed-by-draft-standard way to test for [[__deprecated__]]
etc.; this is supported by GCC 11 and the fallback code should
work fine with GCC 10 and earlier, clang, etc.
* NEWS, doc/attribute.texi:
Mention that DEPRECATED etc. must now come first.
* lib/fflush.c, lib/unistr.in.h:
Do not include unused-parameter.h. All uses of _GL_UNUSED_PARAMETER
(after parameters) replaced by _GL_ATTRIBUTE_MAYBE_UNUSED (before
parameters). Although perhaps we need a shorter name for
_GL_ATTRIBUTE_MAYBE_UNUSED, that should probably be in
gnulib-common.m4, due to the ubiquity of this issue.
And perhaps the snippet/unused-parameter module should be marked
obsolete since it's no longer compatible with its old use.
* m4/gnulib-common.m4 (gl_COMMON_BODY): Define the macro
_GL_HAS_C_ATTRIBUTE, and use it instead of __STDC_VERSION__ in
deciding whether to use C2x attributes like [[__deprecated__]].
(_GL_ATTRIBUTE_MAYBE_UNUSED): Fall back on _GL_ATTRIBUTE_UNUSED.
(_GL_ATTRIBUTE_UNUSED): New macro, for labels where C2x
[[maybe_unused]] do not work.
(_GL_UNUSED, _GL_UNUSED_LABEL): Use it.
* modules/fflush, modules/unistr/base (Depends-on):
Remove snippet/unused-parameter.
* modules/fflush (selinux/selinux.h, selinux/context.h)
(selinux/label.h): Do not use $(UNUSED_PARAMETER).
Remove useless chmod a-x.
Diffstat (limited to 'lib/fts_.h')
-rw-r--r-- | lib/fts_.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/fts_.h b/lib/fts_.h index f1265302b3..9f4419c0a1 100644 --- a/lib/fts_.h +++ b/lib/fts_.h @@ -250,12 +250,21 @@ typedef struct _ftsent { } FTSENT; __BEGIN_DECLS -FTSENT *fts_children (FTS *, int) __THROW _GL_ATTRIBUTE_NODISCARD; -int fts_close (FTS *) __THROW _GL_ATTRIBUTE_NODISCARD; + + _GL_ATTRIBUTE_NODISCARD +FTSENT *fts_children (FTS *, int) __THROW; + +_GL_ATTRIBUTE_NODISCARD +int fts_close (FTS *) __THROW; + +_GL_ATTRIBUTE_NODISCARD FTS *fts_open (char * const *, int, int (*)(const FTSENT **, const FTSENT **)) - __THROW _GL_ATTRIBUTE_NODISCARD; -FTSENT *fts_read (FTS *) __THROW _GL_ATTRIBUTE_NODISCARD; + __THROW; + +_GL_ATTRIBUTE_NODISCARD +FTSENT *fts_read (FTS *) __THROW; + int fts_set (FTS *, FTSENT *, int) __THROW; __END_DECLS |