]> granicus.if.org Git - postgresql/commitdiff
Silence compiler warning in sepgsql
authorJoe Conway <mail@joeconway.com>
Thu, 6 Apr 2017 21:21:25 +0000 (14:21 -0700)
committerJoe Conway <mail@joeconway.com>
Thu, 6 Apr 2017 21:24:29 +0000 (14:24 -0700)
<selinux/label.h> includes <stdbool.h>, which creates an incompatible
We don't care if <stdbool.h> redefines "true"/"false"; those are close
enough.

Complaint and initial patch by Mike Palmiotto. Final approach per
Tom Lane's suggestion, as discussed on hackers. Backpatching to
all supported branches.

Discussion: https://postgr.es/m/flat/623bcaae-112e-ced0-8c22-a84f75ae0c53%40joeconway.com

contrib/sepgsql/label.c

index 1a8f8848f59d5096c1c56d69b190acaf51946283..fc1aab4740f52bb4732045508a78c92a8d4039a5 100644 (file)
  */
 #include "postgres.h"
 
+#include <selinux/label.h>
+
+/*
+ * <selinux/label.h> includes <stdbool.h>, which creates an incompatible
+ * #define for bool.  Get rid of that so we can use our own typedef.
+ * (We don't care if <stdbool.h> redefines "true"/"false"; those are close
+ * enough.)
+ */
+#undef bool
+
 #include "access/heapam.h"
 #include "access/htup_details.h"
 #include "access/genam.h"
@@ -37,8 +47,6 @@
 
 #include "sepgsql.h"
 
-#include <selinux/label.h>
-
 /*
  * Saved hook entries (if stacked)
  */