diff --git a/[refs] b/[refs]
index 53fcf4ffbf58..a085700e744d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 821d35a56044e522e811f6a1e8632cc230360280
+refs/heads/master: 85c3b529f8ad4d65ba86b982ef050212ae7dd976
diff --git a/trunk/scripts/selinux/genheaders/genheaders.c b/trunk/scripts/selinux/genheaders/genheaders.c
index 771b86f46194..24626968055d 100644
--- a/trunk/scripts/selinux/genheaders/genheaders.c
+++ b/trunk/scripts/selinux/genheaders/genheaders.c
@@ -13,7 +13,7 @@ struct security_class_mapping {
 #include "classmap.h"
 #include "initial_sid_to_string.h"
 
-#define max(x, y) ((x > y) ? x : y)
+#define max(x, y) (((int)(x) > (int)(y)) ? x : y)
 
 const char *progname;