From 1746624a7e5d14dcc73f4f959b1dfa1e6f3c210a Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers3@gmail.com>
Date: Tue, 11 Jun 2013 20:14:05 -0500
Subject: [PATCH] Windows:  A couple minor build fixes...

---
 programs/imagex.c | 2 +-
 src/win32_apply.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/imagex.c b/programs/imagex.c
index 0439869d..4e05f5b4 100644
--- 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 7148ca81..471669e1 100644
--- 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);
-- 
2.43.0