Windows: A couple minor build fixes...

diff --git a/programs/imagex.c b/programs/imagex.c
index 0439869d225d98491f5d0e3f825633fb2c824ab5..4e05f5b4fbe335dce37e1d9f07cdbd8e56772ef0 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -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

diff --git a/src/win32_apply.c b/src/win32_apply.c
index 7148ca814151c1106ee425b1a57b9ce2b4651984..471669e1d9eb3ac7ce24be7671f82920e7d739da 100644 (file)
--- a/src/win32_apply.c
+++ b/src/win32_apply.c
@@ -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);