From e44ac577acfb89a8d0c4ff95dc460129d1ffc0ab Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 3 Jul 2013 12:30:04 +0000 Subject: [PATCH] * win32.h (struct acl_t): Make sure struct is 4 byte aligned. --- ChangeLog | 4 ++++ win32.h | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0de2fef7..7b990e87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-07-03 Corinna Vinschen + + * win32.h (struct acl_t): Use a union. + 2013-07-02 Corinna Vinschen * win32.h (struct acl_t): Make sure struct is 4 byte aligned. diff --git a/win32.h b/win32.h index 3fb3583a..cc0232da 100644 --- a/win32.h +++ b/win32.h @@ -75,9 +75,11 @@ (cnt) * (sizeof (ACCESS_ALLOWED_ACE) + MAX_SID_LEN)) struct acl_t { - LONG __align; /* Make sure &acl is 4-byte aligned. */ - ACL acl; - char aclbuf[TOKEN_ACL_SIZE (7)]; + union { + LONG __align; /* Make sure &acl is 4-byte aligned. */ + ACL acl; + }; + char aclbuf[TOKEN_ACL_SIZE (7)]; }; class SIDWrapper { -- 2.43.5