From 3ce1f2959437e952b9db4eaeed2407424f11a4d1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 10 Sep 2011 14:34:15 -0400 Subject: Cleanup of configuration options Make several tool features mandatory and simplify the code. --- iconv/gconv_conf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'iconv') 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 , 1997. @@ -90,10 +90,8 @@ static const char builtin_aliases[] = #undef BUILTIN_ALIAS }; -#ifdef USE_IN_LIBIO -# include -# define __getdelim(line, len, c, fp) _IO_getdelim (line, len, c, fp) -#endif +#include +#define __getdelim(line, len, c, fp) _IO_getdelim (line, len, c, fp) /* Value of the GCONV_PATH environment variable. */ -- cgit 1.4.1