diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 00:37:10 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 00:37:10 +0000 |
| commit | 4bbe4e2185c5484328182720ff7b3bb4f9593bff (patch) | |
| tree | cd67e40a74928c0f58d4f5b79d2e260e4099fee7 /libc/iconv/gconv_conf.c | |
| parent | 91b4be71461f78cabe1fb5f164cea71b60e9e98a (diff) | |
Merge changes between r15223 and r15532 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@15545 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/iconv/gconv_conf.c')
| -rw-r--r-- | libc/iconv/gconv_conf.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libc/iconv/gconv_conf.c b/libc/iconv/gconv_conf.c index 2023beb26..b28cb3c9a 100644 --- a/libc/iconv/gconv_conf.c +++ b/libc/iconv/gconv_conf.c @@ -1,5 +1,5 @@ /* Handle configuration data. - Copyright (C) 1997-2003, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-2003, 2005, 2006, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -90,10 +90,8 @@ static const char builtin_aliases[] = #undef BUILTIN_ALIAS }; -#ifdef USE_IN_LIBIO -# include <libio/libioP.h> -# define __getdelim(line, len, c, fp) _IO_getdelim (line, len, c, fp) -#endif +#include <libio/libioP.h> +#define __getdelim(line, len, c, fp) _IO_getdelim (line, len, c, fp) /* Value of the GCONV_PATH environment variable. */ |