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 /shadow | |
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 'shadow')
-rw-r--r-- | shadow/fgetspent_r.c | 8 | ||||
-rw-r--r-- | shadow/putspent.c | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/shadow/fgetspent_r.c b/shadow/fgetspent_r.c index 16747e10cb..2c907a5add 100644 --- a/shadow/fgetspent_r.c +++ b/shadow/fgetspent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 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,10 +21,8 @@ #include <shadow.h> #include <stdio.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 a line parsing function using the common code used in the nss_files module. */ diff --git a/shadow/putspent.c b/shadow/putspent.c index dc0bcaafbc..c6b53edb2b 100644 --- a/shadow/putspent.c +++ b/shadow/putspent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1996-1998, 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 @@ -19,10 +19,8 @@ #include <stdio.h> #include <shadow.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 : "" |