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. --- grp/fgetgrent_r.c | 10 ++++------ grp/putgrent.c | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'grp') diff --git a/grp/fgetgrent_r.c b/grp/fgetgrent_r.c index 8278a4516b..f7135ee903 100644 --- a/grp/fgetgrent_r.c +++ b/grp/fgetgrent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996-1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996-1999, 2000, 2011 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 @@ -21,11 +21,9 @@ #include #include -#ifdef USE_IN_LIBIO -# include -# define flockfile(s) _IO_flockfile (s) -# define funlockfile(s) _IO_funlockfile (s) -#endif +#include +#define flockfile(s) _IO_flockfile (s) +#define funlockfile(s) _IO_funlockfile (s) /* Define a line parsing function using the common code used in the nss_files module. */ diff --git a/grp/putgrent.c b/grp/putgrent.c index 382d6a4daa..6d7dce9d73 100644 --- a/grp/putgrent.c +++ b/grp/putgrent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,96,98,99,2000,2005 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,96,98,99,2000,2005,2011 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 @@ -20,10 +20,8 @@ #include #include -#ifdef USE_IN_LIBIO -# define flockfile(s) _IO_flockfile (s) -# define funlockfile(s) _IO_funlockfile (s) -#endif +#define flockfile(s) _IO_flockfile (s) +#define funlockfile(s) _IO_funlockfile (s) #define _S(x) x ? x : "" -- cgit v1.2.3