diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/.gitignore | 10 | ||||
-rw-r--r-- | lib/Makefile.am | 13 | ||||
-rw-r--r-- | lib/unistring/cdefs.h | 67 | ||||
-rw-r--r-- | lib/unistring/cdefs.in.h | 22 |
4 files changed, 78 insertions, 34 deletions
diff --git a/lib/.gitignore b/lib/.gitignore index 3e4f5ff..dbfe1f3 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -158,3 +158,13 @@ # Files generated by "make" and distributed (i.e. kept by "make distclean"). /libunistring.sym +/attribute.h +/inttypes.in.h +/iswdigit.c +/iswxdigit.c +/lc-charset-dispatch.c +/lc-charset-dispatch.h +/mbrtowc-impl-utf8.h +/mbrtowc-impl.h +/mbtowc-lock.c +/mbtowc-lock.h diff --git a/lib/Makefile.am b/lib/Makefile.am index 3798a0a..6136ced 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -163,18 +163,7 @@ CLEANFILES += unistring/iconveh.h 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 $(UNUSED_PARAMETER_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 -EXTRA_DIST += unistring/cdefs.in.h +nobase_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..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 */ diff --git a/lib/unistring/cdefs.in.h b/lib/unistring/cdefs.in.h deleted file mode 100644 index 838f8c1..0000000 --- a/lib/unistring/cdefs.in.h +++ /dev/null @@ -1,22 +0,0 @@ -/* 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. */ - -#endif /* _UNISTRING_CDEFS_H */ |