diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-12-10 00:50:30 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-12-10 00:50:30 +0100 |
| commit | 5d633fba9b2bef7246f91b350c19071f26e5f7af (patch) | |
| tree | f4db623feda725a7c4daa69ed93d4a2cd6a7abad | |
| parent | f0da41c71fba8c6b9ff54253917bff3f0b8a9b8e (diff) | |
| download | libunistring-5d633fba9b2bef7246f91b350c19071f26e5f7af.tar.gz | |
Ensure _UNUSED_PARAMETER_ is defined in the public header files.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gnulib-local/lib/unistr.h.diff | 9 | ||||
| -rw-r--r-- | lib/Makefile.am | 3 | ||||
| -rw-r--r-- | lib/unistring/cdefs.h | 31 |
4 files changed, 48 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2009-12-09 Bruno Haible <bruno@clisp.org> + + Ensure _UNUSED_PARAMETER_ is defined in the public header files. + * lib/unistring/cdefs.h: New file, based on gnulib/m4/gnulib-common.m4. + * lib/Makefile.am (nobase_nodist_include_HEADERS): Add it. + * gnulib-local/lib/unistr.h.diff: Include unistring/cdefs.h. + Reported by Mike Gran <spk121@yahoo.com>. + 2009-09-01 Bruno Haible <bruno@clisp.org> * README.woe32: Put the -mno-cygwin option into CC and CXX. diff --git a/gnulib-local/lib/unistr.h.diff b/gnulib-local/lib/unistr.h.diff index 4572049..e68b0c8 100644 --- a/gnulib-local/lib/unistr.h.diff +++ b/gnulib-local/lib/unistr.h.diff @@ -1,5 +1,5 @@ -*** unistr.h.orig 2009-04-05 12:22:17.000000000 +0200 ---- unistr.h 2009-04-10 18:57:37.000000000 +0200 +*** unistr.h.orig 2009-05-03 23:06:37.000000000 +0200 +--- unistr.h 2009-12-09 21:25:58.000000000 +0100 *************** *** 19,26 **** @@ -10,10 +10,13 @@ /* Get size_t. */ #include <stddef.h> ---- 19,29 ---- +--- 19,32 ---- #include "unitypes.h" ++ /* Get common macros for C. */ ++ #include <unistring/cdefs.h> ++ + /* Get inline if available. */ + #include <unistring/inline.h> + diff --git a/lib/Makefile.am b/lib/Makefile.am index 2c8da9d..f9efa8f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -155,6 +155,9 @@ CLEANFILES += unistring/iconveh.h # unistring/version.h is public. nobase_nodist_include_HEADERS += unistring/version.h +# unistring/cdefs.h is not public, but is included by other header files. +nobase_nodist_include_HEADERS += unistring/cdefs.h + # unistring/woe32dll.h is not public, but is included by other header files. nobase_nodist_include_HEADERS += unistring/woe32dll.h diff --git a/lib/unistring/cdefs.h b/lib/unistring/cdefs.h new file mode 100644 index 0000000..23c339c --- /dev/null +++ b/lib/unistring/cdefs.h @@ -0,0 +1,31 @@ +/* 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 <http://www.gnu.org/licenses/>. */ + +#ifndef _UNISTRING_CDEFS_H +#define _UNISTRING_CDEFS_H + +/* Define as a marker that can be attached to function parameter declarations + for parameters that are not used. This helps to reduce warnings, such as + from GCC -Wunused-parameter. */ +#ifndef _UNUSED_PARAMETER_ +# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _UNUSED_PARAMETER_ __attribute__ ((__unused__)) +# else +# define _UNUSED_PARAMETER_ +# endif +#endif + +#endif /* _UNISTRING_CDEFS_H */ |