diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2017-11-27 16:36:06 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2017-11-27 16:36:06 +0300 |
| commit | 76f06705be30663cf823170fe66c9560c9d24566 (patch) | |
| tree | a1af0f5967ac536ad6f98e55c8451758e4162b94 /winsup/cygwin/sec_acl.cc | |
| parent | bc14f1c17487244f9a3c0fccd3400788635a0d48 (diff) | |
cygwin: convert most #ifndef __x86_64__ to #ifdef __i386__
Address the real offender
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/sec_acl.cc')
| -rw-r--r-- | winsup/cygwin/sec_acl.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec_acl.cc index 4a47d22b1..ce7910ed8 100644 --- a/winsup/cygwin/sec_acl.cc +++ b/winsup/cygwin/sec_acl.cc @@ -1227,7 +1227,7 @@ acl32 (const char *path, int cmd, int nentries, aclent_t *aclbufp) return res; } -#ifndef __x86_64__ +#ifdef __i386__ extern "C" int lacl32 (const char *path, int cmd, int nentries, aclent_t *aclbufp) { @@ -1969,18 +1969,7 @@ aclfromtext32 (char *acltextp, int *aclcnt) return (aclent_t *) __aclfromtext (acltextp, aclcnt, false); } -#ifdef __x86_64__ -EXPORT_ALIAS (acl32, acl) -EXPORT_ALIAS (facl32, facl) -EXPORT_ALIAS (aclcheck32, aclcheck) -EXPORT_ALIAS (aclsort32, aclsort) -EXPORT_ALIAS (acltomode32, acltomode) -EXPORT_ALIAS (aclfrommode32, aclfrommode) -EXPORT_ALIAS (acltopbits32, acltopbits) -EXPORT_ALIAS (aclfrompbits32, aclfrompbits) -EXPORT_ALIAS (acltotext32, acltotext) -EXPORT_ALIAS (aclfromtext32, aclfromtext) -#else +#ifdef __i386__ typedef struct __acl16 { int a_type; __uid16_t a_id; @@ -2066,4 +2055,15 @@ aclfromtext (char *acltextp, int *aclcnt) { return (__aclent16_t *) aclfromtext32 (acltextp, aclcnt); } -#endif /* !__x86_64__ */ +#else +EXPORT_ALIAS (acl32, acl) +EXPORT_ALIAS (facl32, facl) +EXPORT_ALIAS (aclcheck32, aclcheck) +EXPORT_ALIAS (aclsort32, aclsort) +EXPORT_ALIAS (acltomode32, acltomode) +EXPORT_ALIAS (aclfrommode32, aclfrommode) +EXPORT_ALIAS (acltopbits32, acltopbits) +EXPORT_ALIAS (aclfrompbits32, aclfrompbits) +EXPORT_ALIAS (acltotext32, acltotext) +EXPORT_ALIAS (aclfromtext32, aclfromtext) +#endif |