diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-12-25 02:50:56 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-12-25 02:50:56 +0100 |
| commit | 43e5d6dc390ec27ed97002f9eb33aa5903b73c81 (patch) | |
| tree | 13c5a11bbe2a74f501fe0729744204f531756361 | |
| parent | 4b8650c5e098e010b1468430e5e9cf4f5b71ba76 (diff) | |
| download | libunistring-43e5d6dc390ec27ed97002f9eb33aa5903b73c81.tar.gz | |
Update after gnulib added module 'unused-parameter'.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gnulib-local/lib/unistr.h.diff | 25 | ||||
| -rw-r--r-- | lib/Makefile.am | 10 | ||||
| -rw-r--r-- | lib/unistring/cdefs.in.h (renamed from lib/unistring/cdefs.h) | 11 |
4 files changed, 34 insertions, 22 deletions
@@ -1,3 +1,13 @@ +2009-12-24 Bruno Haible <bruno@clisp.org> + + Update after gnulib added module 'unused-parameter'. + * gnulib-local/lib/unistr.h.diff: Replace the #include of + "unused-parameter.h". + * lib/unistring/cdefs.in.h: Renamed from lib/unistring/cdefs.h. Replace + the _UNUSED_PARAMETER_ with a placeholder for _GL_UNUSED_PARAMETER. + * lib/Makefile.am (unistring/cdefs.h): New rule. + (BUILT_SOURCES, MOSTLYCLEANFILES, CLEANFILES): Augment. + 2009-12-12 Bruno Haible <bruno@clisp.org> * lib/libunistring.rc: Untabify. diff --git a/gnulib-local/lib/unistr.h.diff b/gnulib-local/lib/unistr.h.diff index e68b0c8..3e59093 100644 --- a/gnulib-local/lib/unistr.h.diff +++ b/gnulib-local/lib/unistr.h.diff @@ -1,25 +1,26 @@ -*** unistr.h.orig 2009-05-03 23:06:37.000000000 +0200 ---- unistr.h 2009-12-09 21:25:58.000000000 +0100 +*** unistr.h.orig 2009-12-24 23:21:27.000000000 +0100 +--- unistr.h 2009-12-25 02:04:40.000000000 +0100 *************** -*** 19,26 **** - +*** 20,29 **** #include "unitypes.h" + /* Get common macros for C. */ +! #include "unused-parameter.h" + /* Get bool. */ ! #include <stdbool.h> /* Get size_t. */ #include <stddef.h> ---- 19,32 ---- - +--- 20,32 ---- #include "unitypes.h" -+ /* Get common macros for C. */ -+ #include <unistring/cdefs.h> -+ -+ /* Get inline if available. */ -+ #include <unistring/inline.h> -+ + /* Get common macros for C. */ +! #include <unistring/cdefs.h> +! +! /* Get inline if available. */ +! #include <unistring/inline.h> + /* Get bool. */ ! #include <unistring/stdbool.h> diff --git a/lib/Makefile.am b/lib/Makefile.am index f9efa8f..5d58942 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -157,6 +157,16 @@ 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/cdefs.h : unistring/cdefs.in.h + @MKDIR_P@ unistring + rm -f $@-t $@ + sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \ + < $(srcdir)/unistring/cdefs.in.h \ + > $@-t + mv $@-t $@ +BUILT_SOURCES += unistring/cdefs.h +MOSTLYCLEANFILES += unistring/cdefs.h-t +CLEANFILES += 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.in.h index 23c339c..2be62c2 100644 --- a/lib/unistring/cdefs.h +++ b/lib/unistring/cdefs.in.h @@ -17,15 +17,6 @@ #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 +/* The definition of _GL_UNUSED_PARAMETER is copied here. */ #endif /* _UNISTRING_CDEFS_H */ |