diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 14:34:15 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 14:34:15 -0400 |
| commit | 3ce1f2959437e952b9db4eaeed2407424f11a4d1 (patch) | |
| tree | db47da854c7d3bfc2c3bce4c6fc8381075ac9ec4 /iconv/gconv_conf.c | |
| parent | 1248c1c41508387ff282b208636737e8cdc9b5b0 (diff) | |
| download | glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.gz glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.xz glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.zip | |
Cleanup of configuration options
Make several tool features mandatory and simplify the code.
Diffstat (limited to 'iconv/gconv_conf.c')
| -rw-r--r-- | iconv/gconv_conf.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index 2023beb267..b28cb3c9ab 100644 --- a/iconv/gconv_conf.c +++ b/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. */ |