mount_image.c: add fallback definitions of RENAME_* constants

[wimlib] / include / wimlib / security_descriptor.h

diff --git a/include/wimlib/security_descriptor.h b/include/wimlib/security_descriptor.h
index e7fd62c7095b4e8e2a3f8993c822dd189067f7cc..f5c5a34c5bdf0cefe1504a271e96aeb092dfd018 100644 (file)
--- a/include/wimlib/security_descriptor.h
+++ b/include/wimlib/security_descriptor.h
@@ -58,7 +58,7 @@ typedef struct {
        /* Offset of Discretionary Access Control List (DACL) in security
         * descriptor, or 0 if no DACL is present  */
        le32 dacl_offset;
-} _packed_attribute wimlib_SECURITY_DESCRIPTOR_RELATIVE;
+} __attribute__((packed)) wimlib_SECURITY_DESCRIPTOR_RELATIVE;
 
 #define wimlib_SE_OWNER_DEFAULTED              0x0001
 #define wimlib_SE_GROUP_DEFAULTED              0x0002
@@ -85,7 +85,7 @@ typedef struct {
        u8  identifier_authority[6];
 
        le32 sub_authority[];
-} _packed_attribute wimlib_SID;
+} __attribute__((packed)) wimlib_SID;
 
 /* Header of a Windows NT access control list  */
 typedef struct {
@@ -104,7 +104,7 @@ typedef struct {
 
        /* padding  */
        le16 sbz2;
-} _packed_attribute wimlib_ACL;
+} __attribute__((packed)) wimlib_ACL;
 
 #define wimlib_ACCESS_ALLOWED_ACE_TYPE         0
 #define wimlib_ACCESS_DENIED_ACE_TYPE          1
@@ -120,27 +120,27 @@ typedef struct {
 
        /* Size of the access control entry, including this header  */
        le16 size;
-} _packed_attribute wimlib_ACE_HEADER;
+} __attribute__((packed)) wimlib_ACE_HEADER;
 
 /* Windows NT access control entry to grant rights to a user or group  */
 typedef struct {
        wimlib_ACE_HEADER hdr;
        le32 mask;
        wimlib_SID sid;
-} _packed_attribute wimlib_ACCESS_ALLOWED_ACE;
+} __attribute__((packed)) wimlib_ACCESS_ALLOWED_ACE;
 
 /* Windows NT access control entry to deny rights to a user or group  */
 typedef struct {
        wimlib_ACE_HEADER hdr;
        le32 mask;
        wimlib_SID sid;
-} _packed_attribute wimlib_ACCESS_DENIED_ACE;
+} __attribute__((packed)) wimlib_ACCESS_DENIED_ACE;
 
 /* Windows NT access control entry to audit access to the object  */
 typedef struct {
        wimlib_ACE_HEADER hdr;
        le32 mask;
        wimlib_SID sid;
-} _packed_attribute wimlib_SYSTEM_AUDIT_ACE;
+} __attribute__((packed)) wimlib_SYSTEM_AUDIT_ACE;
 
 #endif /* _WIMLIB_SECURITY_DESCRIPTOR_H */