summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2020-05-08 07:31:45 (GMT)
committerBruno Haible <bruno@clisp.org>2020-05-08 07:51:25 (GMT)
commit5aef83dcdb0806d6e53d8d85d65e4361c8bf9d51 (patch)
treec9f7a05692491858b2870ccaf5c4ed68e0b2700a
parent216010baaeb5577b199c4ae122121673254a189f (diff)
downloadlibunistring-5aef83dcdb0806d6e53d8d85d65e4361c8bf9d51.tar.gz
build: Tweak last commit.
* lib/unistring/cdefs.h: Clarify license.
-rw-r--r--gnulib-m4/.gitignore10
-rw-r--r--lib/.gitignore20
-rw-r--r--lib/unistring/cdefs.h28
-rw-r--r--tests/.gitignore18
4 files changed, 24 insertions, 52 deletions
diff --git a/gnulib-m4/.gitignore b/gnulib-m4/.gitignore
index 961656c..0f18e4e 100644
--- a/gnulib-m4/.gitignore
+++ b/gnulib-m4/.gitignore
@@ -62,6 +62,8 @@
/isnanf.m4
/isnanl.m4
/iswblank.m4
+/iswdigit.m4
+/iswxdigit.m4
/langinfo_h.m4
/largefile.m4
/lcmessage.m4
@@ -98,6 +100,7 @@
/msvc-inval.m4
/msvc-nothrow.m4
/multiarch.m4
+/musl.m4
/nanosleep.m4
/netinet_in_h.m4
/nocrash.m4
@@ -120,6 +123,7 @@
/relocatable-lib.m4
/sched_h.m4
/select.m4
+/semaphore.m4
/setenv.m4
/setlocale.m4
/setlocale_null.m4
@@ -162,6 +166,7 @@
/unistd_h.m4
/usleep.m4
/vasnprintf.m4
+/visibility.m4
/warn-on-use.m4
/wchar_h.m4
/wchar_t.m4
@@ -174,9 +179,4 @@
/xalloc.m4
/xsize.m4
/yield.m4
-/iswdigit.m4
-/iswxdigit.m4
-/musl.m4
-/semaphore.m4
-/visibility.m4
/zzgnulib.m4
diff --git a/lib/.gitignore b/lib/.gitignore
index dbfe1f3..139c698 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -6,6 +6,7 @@
/amemxfrm.h
/arg-nonnull.h
/array-mergesort.h
+/attribute.h
/c++defs.h
/c-ctype.c
/c-ctype.h
@@ -38,6 +39,7 @@
/iconv_open-zos.gperf
/iconv_open.c
/iconveh.h
+/inttypes.in.h
/isnan.c
/isnand-nolibm.h
/isnand.c
@@ -46,8 +48,12 @@
/isnanl-nolibm.h
/isnanl.c
/iswblank.c
+/iswdigit.c
+/iswxdigit.c
/itold.c
/langinfo.in.h
+/lc-charset-dispatch.c
+/lc-charset-dispatch.h
/limits.in.h
/localcharset.c
/localcharset.h
@@ -65,9 +71,13 @@
/mbchar.h
/mbiter.c
/mbiter.h
+/mbrtowc-impl-utf8.h
+/mbrtowc-impl.h
/mbrtowc.c
/mbsinit.c
/mbsnlen.c
+/mbtowc-lock.c
+/mbtowc-lock.h
/memchr.c
/memchr.valgrind
/memcmp2.c
@@ -158,13 +168,3 @@
# 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/unistring/cdefs.h b/lib/unistring/cdefs.h
index 502da17..e186b3a 100644
--- a/lib/unistring/cdefs.h
+++ b/lib/unistring/cdefs.h
@@ -1,5 +1,5 @@
/* Common macro definitions for C include files.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ 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 the GNU Lesser General Public License as published
@@ -17,32 +17,6 @@
#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:
diff --git a/tests/.gitignore b/tests/.gitignore
index 1e0ecd3..a218a9e 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -18,7 +18,6 @@
/ctype.in.h
/dirname-lgpl.c
/dirname.h
-/dosname.h
/dup2.c
/error.c
/error.h
@@ -45,7 +44,6 @@
/infinity.h
/init.sh
/intprops.h
-/inttypes.in.h
/ioctl.c
/isblank.c
/listen.c
@@ -169,6 +167,10 @@
/test-isnanl-nolibm.c
/test-isnanl.h
/test-iswblank.c
+/test-iswdigit.c
+/test-iswdigit.sh
+/test-iswxdigit.c
+/test-iswxdigit.sh
/test-langinfo.c
/test-limits-h.c
/test-listen.c
@@ -185,6 +187,10 @@
/test-mbrtowc-w32-3.sh
/test-mbrtowc-w32-4.sh
/test-mbrtowc-w32-5.sh
+/test-mbrtowc-w32-6.sh
+/test-mbrtowc-w32-7.sh
+/test-wcrtomb-w32-6.sh
+/test-wcrtomb-w32-7.sh
/test-mbrtowc-w32.c
/test-mbrtowc.c
/test-mbrtowc1.sh
@@ -305,11 +311,3 @@
# Files generated by the autotools:
/Makefile.in
-/test-iswdigit.c
-/test-iswdigit.sh
-/test-iswxdigit.c
-/test-iswxdigit.sh
-/test-mbrtowc-w32-6.sh
-/test-mbrtowc-w32-7.sh
-/test-wcrtomb-w32-6.sh
-/test-wcrtomb-w32-7.sh