JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove __acl16 from official header 

* include/cyggwin/acl.h (struct __acl16): Move from here...
	* sec_acl.cc: ...to here.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-04-08 10:01:59 +02:00
parent 5707076d0c
commit 6326a8c0f3
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2015-04-08 Corinna Vinschen <corinna@vinschen.de>
* include/cyggwin/acl.h (struct __acl16): Move from here...
* sec_acl.cc: ...to here.
2015-04-07 Corinna Vinschen <corinna@vinschen.de>
* tty.h (class tty): Remove unused 32/64 bit interoperability

10
winsup/cygwin/include/cygwin/acl.h
View File

@ -66,16 +66,6 @@ extern "C" {
#define MASK CLASS_OBJ
#define OTHER OTHER_OBJ
#ifdef __INSIDE_CYGWIN__
#ifndef __x86_64__
typedef struct __acl16 {
int a_type;
__uid16_t a_id;
mode_t a_perm;
} __aclent16_t;
#endif
#endif
typedef struct acl {
int a_type; /* entry type */
uid_t a_id; /* UID | GID */

6
winsup/cygwin/sec_acl.cc
View File

@ -1323,6 +1323,12 @@ EXPORT_ALIAS (aclfrompbits32, aclfrompbits)
EXPORT_ALIAS (acltotext32, acltotext)
EXPORT_ALIAS (aclfromtext32, aclfromtext)
#else
typedef struct __acl16 {
int a_type;
__uid16_t a_id;
mode_t a_perm;
} __aclent16_t;
/* __aclent16_t and aclent_t have same size and same member offsets */
static aclent_t *
acl16to32 (__aclent16_t *aclbufp, int nentries)