diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 00:37:10 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 00:37:10 +0000 |
| commit | 4bbe4e2185c5484328182720ff7b3bb4f9593bff (patch) | |
| tree | cd67e40a74928c0f58d4f5b79d2e260e4099fee7 /libc/grp/putgrent.c | |
| parent | 91b4be71461f78cabe1fb5f164cea71b60e9e98a (diff) | |
Merge changes between r15223 and r15532 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@15545 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/grp/putgrent.c')
| -rw-r--r-- | libc/grp/putgrent.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libc/grp/putgrent.c b/libc/grp/putgrent.c index 382d6a4da..6d7dce9d7 100644 --- a/libc/grp/putgrent.c +++ b/libc/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 : "" |