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 /grp | |
| 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 'grp')
| -rw-r--r-- | grp/fgetgrent_r.c | 10 | ||||
| -rw-r--r-- | grp/putgrent.c | 8 |
2 files changed, 7 insertions, 11 deletions
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 <grp.h> #include <stdio.h> -#ifdef USE_IN_LIBIO -# include <libio/iolibio.h> -# define flockfile(s) _IO_flockfile (s) -# define funlockfile(s) _IO_funlockfile (s) -#endif +#include <libio/iolibio.h> +#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 <stdio.h> #include <grp.h> -#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 : "" |