From f5849c1fad31ab3ed1a1dc36dad2b3164faf8a99 Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@redhat.com>
Date: Jan 23 2012 18:39:03 +0000
Subject: Add Dan Berrange code cleanup patches.


---

diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index c55f204..242007c 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -1,13 +1,17 @@
 diff --git a/libselinux/include/selinux/avc.h b/libselinux/include/selinux/avc.h
-index da18e41..9655957 100644
+index da18e41..87a2b12 100644
 --- a/libselinux/include/selinux/avc.h
 +++ b/libselinux/include/selinux/avc.h
-@@ -130,7 +130,7 @@ struct avc_memory_callback {
+@@ -130,7 +130,11 @@ struct avc_memory_callback {
  
  struct avc_log_callback {
  	/* log the printf-style format and arguments. */
 -	void (*func_log) (const char *fmt, ...);
-+	void (*func_log) (const char *fmt, ...) __attribute__((__format__(printf, 1, 2)));
++	void
++#ifdef __GNUC__
++__attribute__ ((format(printf, 1, 2)))
++#endif
++	(*func_log) (const char *fmt, ...);
  	/* store a string representation of auditdata (corresponding
  	   to the given security class) into msgbuf. */
  	void (*func_audit) (void *auditdata, security_class_t cls,