This is the mail archive of the
cygwin-cvs@cygwin.com
mailing list for the Cygwin project.
[newlib-cygwin/cygwin-2.0] Remove __acl16 from official header
- From: Corinna Vinschen <corinna at sourceware dot org>
- To: cygwin-cvs at sourceware dot org
- Date: 23 Apr 2015 20:51:38 -0000
- Subject: [newlib-cygwin/cygwin-2.0] Remove __acl16 from official header
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=651bb62ae24cf5081f244085a652261abce92696
commit 651bb62ae24cf5081f244085a652261abce92696
Author: Corinna Vinschen <corinna@vinschen.de>
Date: Wed Apr 8 10:01:59 2015 +0200
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>
Diff:
---
winsup/cygwin/ChangeLog | 5 +++++
winsup/cygwin/include/cygwin/acl.h | 10 ----------
winsup/cygwin/sec_acl.cc | 6 ++++++
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8065e73..659f568 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 8fa5a65..34f1c0c 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 e5019cb..5a2048c 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)