Windows: A couple minor build fixes... v1.4.2
authorEric Biggers <ebiggers3@gmail.com>
Wed, 12 Jun 2013 01:14:05 +0000 (20:14 -0500)
committerEric Biggers <ebiggers3@gmail.com>
Wed, 12 Jun 2013 01:14:05 +0000 (20:14 -0500)
programs/imagex.c
src/win32_apply.c

index 0439869..4e05f5b 100644 (file)
@@ -384,7 +384,7 @@ static const struct option update_options[] = {
        {NULL, 0, NULL, 0},
 };
 
-#ifdef __GNUC__
+#if 0
 #      define _format_attribute(type, format_str, args_start) \
                        __attribute__((format(type, format_str, args_start)))
 #else
index 7148ca8..471669e 100644 (file)
@@ -302,7 +302,7 @@ win32_set_security_data(const struct wim_inode *inode,
        BOOL sacl_present;
        BOOL sacl_defaulted;
 
-       sd = wim_const_security_data(args->w);
+       sd = wim_const_security_data(args->wim);
        descriptor = sd->descriptors[inode->i_security_id];
 
        GetSecurityDescriptorOwner(descriptor, &owner, &owner_defaulted);