postgres.git / summary / log / commit / refs

commit    649cd9085efb2cb4e21eec3b3861f46e89ba3a34
Author:   Joe Conway <mail@joeconway.com>
Date:     Thu Apr 06 21:21:54 2017 +0000

    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


 contrib/sepgsql/label.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c
index 7cd4f67ae10..4dce097e383 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/htup_details.h"
 #include "access/genam.h"
@@ -37,8 +47,6 @@
 
 #include "sepgsql.h"
 
-#include <selinux/label.h>
-
 /*
  * Saved hook entries (if stacked)
  */


[parent: c2f08c642945]