* (child_info.h, cygheap.h, dcrt0.cc, dir.cc, fhandler.cc, fhandler.h,

	fhandler_clipboard.cc, fhandler_disk_file.cc, fhandler_dsp.cc,
	fhandler_floppy.cc, fhandler_mem.cc, fhandler_random.cc,
	fhandler_tape.cc, fhandler_zero.cc, grp.cc, mmap.cc, passwd.cc,
	pinfo.cc, pinfo.h, pipe.cc, sec_acl.cc, sec_helper.cc, security.cc,
	security.h, spawn.cc, syscalls.cc, thread.h, uinfo.cc, winsup.h):
	Change usage of uid_t to __uid16_t, gid_t to __gid16_t and
	off_t to __off32_t throughout.  Use INVALID_UID, INVALID_GID and
	INVALID_SEEK instead casting -1 to the appropriate type.
	* winsup.h: Define INVALID_UID, INVALID_GID and INVALID_SEEK.
	* include/cygwin/acl.h: Define internal __aclent16_t and __aclent32_t
	types.  Don't declare acl functions when compiling Cygwin.
	* include/cygwin/grp.h: Declare getgrgid() and getgrnam() with
	correct types for internal usage.

2 files changed, 24 insertions, 5 deletions

diff --git a/winsup/cygwin/include/cygwin/acl.h b/winsup/cygwin/include/cygwin/acl.h
index 3248b2e68..15d4b5c6c 100644
--- a/winsup/cygwin/include/cygwin/acl.h
+++ b/winsup/cygwin/include/cygwin/acl.h
@@ -58,12 +58,27 @@ extern "C" {
 #define MASK            CLASS_OBJ
 #define OTHER           OTHER_OBJ
 
-typedef struct acl {
-    int      a_type;    /* entry type */
-    uid_t    a_id;      /* UID | GID  */
-    mode_t   a_perm;    /* permissions */
-} aclent_t;
+#ifdef __INSIDE_CYGWIN__
+typedef struct __acl16 {
+    int          a_type;    /* entry type */
+    __uid16_t    a_id;      /* UID | GID  */
+    mode_t       a_perm;    /* permissions */
+} __aclent16_t;
 
+typedef struct __acl32 {
+    int          a_type;    /* entry type */
+    __uid32_t    a_id;      /* UID | GID  */
+    mode_t       a_perm;    /* permissions */
+} __aclent32_t;
+#endif
+
+typedef struct __acl {
+    int          a_type;    /* entry type */
+    uid_t      a_id;      /* UID | GID  */
+    mode_t       a_perm;    /* permissions */
+} __aclent_t;
+
+#ifndef __INSIDE_CYGWIN__
 int _EXFUN(acl,(const char *path, int cmd, int nentries, aclent_t *aclbufp));
 int _EXFUN(lacl,(const char *path, int cmd, int nentries, aclent_t *aclbufp));
 int _EXFUN(facl,(int fd, int cmd, int nentries, aclent_t *aclbufp));
@@ -75,6 +90,7 @@ int _EXFUN(acltopbits,(aclent_t *aclbufp, int nentries, mode_t *pbitsp));
 int _EXFUN(aclfrompbits,(aclent_t *aclbufp, int nentries, mode_t *pbitsp));
 char *_EXFUN(acltotext,(aclent_t *aclbufp, int aclcnt));
 aclent_t *_EXFUN(aclfromtext,(char *acltextp, int *aclcnt));
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/winsup/cygwin/include/cygwin/grp.h b/winsup/cygwin/include/cygwin/grp.h
index 79b4bccff..3a58e2058 100644
--- a/winsup/cygwin/include/cygwin/grp.h
+++ b/winsup/cygwin/include/cygwin/grp.h
@@ -34,6 +34,9 @@ struct __group32
   __gid32_t gr_gid;
   char **gr_mem;
 };
+
+struct __group16 * getgrgid (__gid16_t gid);
+struct __group16 * getgrnam (const char *name);
 #endif
 
 #ifdef __cplusplus