diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 19:21:56 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 19:21:56 +0200 |
| commit | 525c181a5a9a95e24d2111b7792608151a40eb84 (patch) | |
| tree | 8ba16eeb3fb7327e5c3c5bba9c5786d4bb6ccec1 /iconv/gconv_conf.c | |
| parent | 4dd9e35bfd35d3138bc44169baba098005bad51e (diff) | |
| parent | 7bb5f8a836b916d6ebf7b6921b136e99cea2442d (diff) | |
Merge commit 'refs/top-bases/t/bigmem' into t/bigmem
Diffstat (limited to 'iconv/gconv_conf.c')
| -rw-r--r-- | iconv/gconv_conf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index 0ba4739c41..e23518846c 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -1,5 +1,5 @@ /* Handle configuration data. - Copyright (C) 1997-2015 Free Software Foundation, Inc. + Copyright (C) 1997-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -31,7 +31,7 @@ #include <unistd.h> #include <sys/param.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <gconv_int.h> |