date and time created 90/06/25 13:56:22 by bostic

[unix-history] / usr / src / include / grp.h

diff --git a/usr/src/include/grp.h b/usr/src/include/grp.h
index 6fd0832..f2b29b2 100644 (file)
--- a/usr/src/include/grp.h
+++ b/usr/src/include/grp.h
@@ -1,23 +1,15 @@
-/*
- * Copyright (c) 1988 The Regents of the University of California.
+/*-
+ * Copyright (c) 1989 The Regents of the University of California.

  * All rights reserved.
  *
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)grp.h       4.5 (Berkeley) %G%
+ *     @(#)grp.h       5.2 (Berkeley) %G%

  */
 
  */
 

+#ifndef _POSIX_SOURCE

 #define        _PATH_GROUP             "/etc/group"
 #define        _PATH_GROUP             "/etc/group"

+#endif

 
 struct group {
        char    *gr_name;               /* group name */
 
 struct group {
        char    *gr_name;               /* group name */


@@ -26,20 +18,24 @@ struct group {
        char    **gr_mem;               /* group members */
 };
 
        char    **gr_mem;               /* group members */
 };
 

-#ifdef __STDC__
-extern struct group *getgrent(void);
+#if __STDC__ || c_plusplus

 extern struct group *getgrgid(gid_t);
 extern struct group *getgrnam(const char *);
 extern struct group *getgrgid(gid_t);
 extern struct group *getgrnam(const char *);

+#ifndef _POSIX_SOURCE
+extern struct group *getgrent(void);

 extern int setgrent(void);
 extern void endgrent(void);
 extern void setgrfile(const char *);
 extern int setgroupent(int);
 extern int setgrent(void);
 extern void endgrent(void);
 extern void setgrfile(const char *);
 extern int setgroupent(int);

+#endif

 #else
 #else

-extern struct group *getgrent();

 extern struct group *getgrgid();
 extern struct group *getgrnam();
 extern struct group *getgrgid();
 extern struct group *getgrnam();

+#ifndef _POSIX_SOURCE
+extern struct group *getgrent();

 extern int setgrent();
 extern void endgrent();
 extern void setgrfile();
 extern int setgroupent();
 #endif
 extern int setgrent();
 extern void endgrent();
 extern void setgrfile();
 extern int setgroupent();
 #endif

+#endif