summaryrefslogtreecommitdiff
path: root/grp/grp.h
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-01-15 10:44:48 +0100
committerAndreas Schwab <schwab@redhat.com>2010-01-15 10:51:34 +0100
commit2384b50e7d567cc26553443b6790b3062d405463 (patch)
treea5ed604cf90256b1fa8e075b98bb0c668d671b55 /grp/grp.h
parente6073eebddb6c1c58d23175826515a3522c785da (diff)
parent5306d3613a3e71d8ede6529e858e2398223ac3da (diff)
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'grp/grp.h')
-rw-r--r--grp/grp.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/grp/grp.h b/grp/grp.h
index d7cc69d0eb..c06ef03ae6 100644
--- a/grp/grp.h
+++ b/grp/grp.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1992,1995-2001,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1995-2001,2003,2004,2010
+ 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
@@ -61,7 +62,10 @@ struct group
This function is a possible cancellation point and therefore not
marked with __THROW. */
extern void setgrent (void);
+#endif
+#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED \
+ || defined __USE_XOPEN2K8
/* Close the group-file stream.
This function is a possible cancellation point and therefore not