Libc-594.9.1.tar.gz

[apple/libc.git] / include / grp.h

diff --git a/include/grp.h b/include/grp.h
index 987a4e2cd1550fbc7c2feb614075110cd46c7983..10f230ec5391c48fe8712d60ddf089a11aa4f77e 100644 (file)
--- a/include/grp.h
+++ b/include/grp.h
@@ -3,8 +3,6 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -65,11 +63,11 @@
 #ifndef _GRP_H_
 #define        _GRP_H_
 
-#include <sys/_types.h>
+#include <_types.h>
 
-#ifndef _GID_T_DECLARED
-typedef __gid_t         gid_t;         /* [XBD] */
-#define _GID_T_DECLARED
+#ifndef _GID_T
+typedef __darwin_gid_t gid_t;          /* [XBD] */
+#define _GID_T
 #endif
 
 /*
@@ -77,12 +75,12 @@ typedef __gid_t         gid_t;              /* [XBD] */
  * prototypes defined by [TSF] for the thread reentrant functions include
  * it as a type for their 4th arguments, so we define it here.
  */
-#ifndef _BSD_SIZE_T_DEFINED_
-#define _BSD_SIZE_T_DEFINED_
-typedef __size_t       size_t;         /* [???] */
+#ifndef _SIZE_T
+#define _SIZE_T
+typedef __darwin_size_t        size_t;         /* [???] */
 #endif
 
-#ifndef _POSIX_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 #define        _PATH_GROUP             "/etc/group"
 #endif
 
@@ -104,11 +102,11 @@ int getgrgid_r(gid_t, struct group *, char *, size_t, struct group **);
 int getgrnam_r(const char *, struct group *, char *, size_t, struct group **);
 /* [XSI] */
 struct group *getgrent(void);
-int setgrent(void);
+void setgrent(void);
 void endgrent(void);
 
-#ifndef _POSIX_SOURCE
-#ifndef _XOPEN_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#if !defined(_XOPEN_SOURCE) || defined(_DARWIN_C_SOURCE)
 char *group_from_gid(gid_t, int);
 #endif
 void setgrfile(const char *);