diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 20:01:19 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 20:01:19 +0200 |
commit | 3896c5809b49e72fbadc57da2189ff42aa2a5d02 (patch) | |
tree | 976132226affe5ff11686d86d01d059aa5eabc6c /libidn | |
parent | 52c6cb0bba348bf5f25ff2a213e04c0f3fc378aa (diff) | |
parent | 4dc1e6e42f1f602e1d2227e112f2db8dce9da763 (diff) |
Merge commit 'refs/top-bases/t/hurdsig-boot-fix' into t/hurdsig-boot-fix
Diffstat (limited to 'libidn')
-rw-r--r-- | libidn/ChangeLog | 5 | ||||
-rw-r--r-- | libidn/Makefile | 2 | ||||
-rw-r--r-- | libidn/iconvme.c | 2 | ||||
-rw-r--r-- | libidn/iconvme.h | 2 | ||||
-rw-r--r-- | libidn/idn-stub.c | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/libidn/ChangeLog b/libidn/ChangeLog index ed36a067b8..47b1cedc20 100644 --- a/libidn/ChangeLog +++ b/libidn/ChangeLog @@ -1,3 +1,8 @@ +2016-01-04 Joseph Myers <joseph@codesourcery.com> + + * All files with FSF copyright notices: Update copyright dates + using ../scripts/update-copyrights. + 2015-01-02 Joseph Myers <joseph@codesourcery.com> * All files with FSF copyright notices: Update copyright dates diff --git a/libidn/Makefile b/libidn/Makefile index 940fa52657..1d81a92f8f 100644 --- a/libidn/Makefile +++ b/libidn/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 2003-2016 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or diff --git a/libidn/iconvme.c b/libidn/iconvme.c index 45b3fd394b..94373de88a 100644 --- a/libidn/iconvme.c +++ b/libidn/iconvme.c @@ -1,5 +1,5 @@ /* Recode strings between character sets, using iconv. - Copyright (C) 2002-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2016 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 diff --git a/libidn/iconvme.h b/libidn/iconvme.h index ea9fe8cc43..c39d204aee 100644 --- a/libidn/iconvme.h +++ b/libidn/iconvme.h @@ -1,5 +1,5 @@ /* Recode strings between character sets, using iconv. - Copyright (C) 2004-2015 Free Software Foundation, Inc. + Copyright (C) 2004-2016 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/libidn/idn-stub.c b/libidn/idn-stub.c index afd93caed8..fb67f74b8d 100644 --- a/libidn/idn-stub.c +++ b/libidn/idn-stub.c @@ -22,7 +22,7 @@ #include <string.h> #include <dlfcn.h> #include <gnu/lib-names.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* Get specification for idna_to_ascii_lz. */ #include "idna.h" |