diff options
author | Daiki Ueno <ueno@gnu.org> | 2020-05-07 20:06:18 +0200 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2020-05-07 20:06:18 +0200 |
commit | 216010baaeb5577b199c4ae122121673254a189f (patch) | |
tree | c7adf7a72f713ecb931725783a5622c06fb3b1d9 /lib/unistring/cdefs.h | |
parent | 10b6e6a6e705935e39f71d9a5cf06b39f4f3570f (diff) | |
download | libunistring-216010baaeb5577b199c4ae122121673254a189f.tar.gz |
build: Update after gnulib changed
In the latest Gnulib, the definition of _GL_UNUSED_PARAMETER is
expanded at configure time of the consumer project. Let's include
only the fallback definition in <unistring/cdefs.h>.
Suggested by Dmitry Baryshkov <dbaryshkov@gmail.com> in:
<https://lists.gnu.org/archive/html/bug-libunistring/2020-05/msg00001.html>.
* lib/Makefile.am (unistring/cdefs.h): Don't generate the file.
* lib/unistring/cdefs.h: Include the expanded form instead of ...
* lib/unistring/cdefs.in.h: ... this.
* gnulib-m4/.gitignore, gnulib-m4/gnulib-cache.m4, lib/.gitignore,
tests/.gitignore: Updated.
Diffstat (limited to 'lib/unistring/cdefs.h')
-rw-r--r-- | lib/unistring/cdefs.h | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/lib/unistring/cdefs.h b/lib/unistring/cdefs.h new file mode 100644 index 0000000..502da17 --- /dev/null +++ b/lib/unistring/cdefs.h @@ -0,0 +1,67 @@ +/* Common macro definitions for C include files. + Copyright (C) 2009 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#ifndef _UNISTRING_CDEFS_H +#define _UNISTRING_CDEFS_H + +/* The definition of _GL_UNUSED_PARAMETER is copied here. */ +/* A C macro for declaring that specific function parameters are not used. + Copyright (C) 2008-2020 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or + modify it under the terms of either: + + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your + option) any later version. + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + or both in parallel, as here. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* _GL_UNUSED_PARAMETER is a marker that can be appended to function parameter + declarations for parameters that are not used. This helps to reduce + warnings, such as from GCC -Wunused-parameter. The syntax is as follows: + type param _GL_UNUSED_PARAMETER + or more generally + param_decl _GL_UNUSED_PARAMETER + For example: + int param _GL_UNUSED_PARAMETER + int *(*param)(void) _GL_UNUSED_PARAMETER + Other possible, but obscure and discouraged syntaxes: + int _GL_UNUSED_PARAMETER *(*param)(void) + _GL_UNUSED_PARAMETER int *(*param)(void) + */ +#ifndef _GL_UNUSED_PARAMETER +# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _GL_UNUSED_PARAMETER __attribute__ ((__unused__)) +# else +# define _GL_UNUSED_PARAMETER +# endif +#endif + +#endif /* _UNISTRING_CDEFS_H */ |