diff options
| author | Simon Josefsson <simon@josefsson.org> | 2012-11-26 21:26:27 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2012-11-26 21:26:27 +0100 |
| commit | ec66eec0633b01645b6c50b29ad2bbb0f6d0f4c8 (patch) | |
| tree | 3d24713cd698a70dfbfd3461f650e28b19071b22 | |
| parent | 67a6c9c6299183bdc4c5a0307930ff273b0ff034 (diff) | |
| download | gnutls-ec66eec0633b01645b6c50b29ad2bbb0f6d0f4c8.tar.gz | |
Update gnulib tools. Add missing unused-parameter.h template.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | build-aux/snippet/unused-parameter.h | 36 | ||||
| -rw-r--r-- | doc/gendocs_template | 2 | ||||
| -rw-r--r-- | maint.mk | 5 |
4 files changed, 39 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index ca25443179..a4d8f64d21 100644 --- a/.gitignore +++ b/.gitignore @@ -612,7 +612,6 @@ gl/unistr.h gl/tests/unused-parameter.h gl/tests/locale.h gl/iconv.h -build-aux/snippet/unused-parameter.h gl/tests/test-c-strcasecmp gl/tests/test-c-strncasecmp gl/tests/test-iconv-h diff --git a/build-aux/snippet/unused-parameter.h b/build-aux/snippet/unused-parameter.h new file mode 100644 index 0000000000..1c8d61f283 --- /dev/null +++ b/build-aux/snippet/unused-parameter.h @@ -0,0 +1,36 @@ +/* A C macro for declaring that specific function parameters are not used. + Copyright (C) 2008-2012 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU 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 + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://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 diff --git a/doc/gendocs_template b/doc/gendocs_template index 0144603c77..03c3aa56f0 100644 --- a/doc/gendocs_template +++ b/doc/gendocs_template @@ -45,8 +45,6 @@ (%%ASCII_GZ_SIZE%%K bytes gzipped)</a>.</li> <li><a href="%%PACKAGE%%.dvi.gz">TeX dvi file (%%DVI_GZ_SIZE%%K bytes gzipped)</a>.</li> -<li><a href="%%PACKAGE%%.ps.gz">PostScript file - (%%PS_GZ_SIZE%%K bytes gzipped)</a>.</li> <li><a href="%%PACKAGE%%.pdf">PDF file (%%PDF_SIZE%%K bytes)</a>.</li> <li><a href="%%PACKAGE%%.texi.tar.gz">Texinfo source @@ -1390,8 +1390,9 @@ submodule-checks ?= no-submodule-changes public-submodule-commit public-submodule-commit: $(AM_V_GEN)if test -d $(srcdir)/.git; then \ cd $(srcdir) && \ - git submodule --quiet foreach test '$$(git rev-parse $$sha1)' \ - = '$$(git merge-base origin $$sha1)' \ + git submodule --quiet foreach \ + test '"$$(git rev-parse "$$sha1")"' \ + = '"$$(git merge-base origin "$$sha1")"' \ || { echo '$(ME): found non-public submodule commit' >&2; \ exit 1; }; \ else \ |