diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-04-08 11:01:59 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-04-23 22:57:12 +0300 |
| commit | 651bb62ae24cf5081f244085a652261abce92696 (patch) | |
| tree | 3e9b96751cc69635b4a4a1d03e638e5516eea1b9 /winsup | |
| parent | 61a2d9dedb99bea05b990ac290f79241d5ddf4d8 (diff) | |
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>
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/include/cygwin/acl.h | 10 | ||||
| -rw-r--r-- | winsup/cygwin/sec_acl.cc | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 8065e7375..659f56823 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -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 diff --git a/winsup/cygwin/include/cygwin/acl.h b/winsup/cygwin/include/cygwin/acl.h index 8fa5a65a5..34f1c0c44 100644 --- a/winsup/cygwin/include/cygwin/acl.h +++ b/winsup/cygwin/include/cygwin/acl.h @@ -58,16 +58,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 */ diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec_acl.cc index e5019cb35..5a2048caf 100644 --- a/winsup/cygwin/sec_acl.cc +++ b/winsup/cygwin/sec_acl.cc @@ -1102,6 +1102,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) |