From: Joe Conway <mail@joeconway.com>
Date: Thu, 6 Apr 2017 21:22:01 +0000 (-0700)
Subject: Silence compiler warning in sepgsql
X-Git-Tag: REL9_2_21~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d6f5b446fc84d8974087e66d2603ef81387a052;p=thirdparty%2Fpostgresql.git

Silence compiler warning in sepgsql

<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
---

diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c
index e973841027f..b0ec3408792 100644
--- a/contrib/sepgsql/label.c
+++ b/contrib/sepgsql/label.c
@@ -10,6 +10,16 @@
  */
 #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/genam.h"
 #include "access/xact.h"
@@ -36,8 +46,6 @@
 
 #include "sepgsql.h"
 
-#include <selinux/label.h>
-
 /*
  * Saved hook entries (if stacked)
  */