diff options
| author | Joe Conway <mail@joeconway.com> | 2017-04-06 14:21:31 -0700 |
|---|---|---|
| committer | Joe Conway <mail@joeconway.com> | 2017-04-06 14:24:41 -0700 |
| commit | dd93afca3a0a4c18ac17ee14f7874994f4ced9b5 (patch) | |
| tree | b75e65bb4a0c3238801144f667867d672a54af2b | |
| parent | b3721f7d13aa527961688b98dbc09acff30c938c (diff) | |
| download | postgresql-dd93afca3a0a4c18ac17ee14f7874994f4ced9b5.tar.gz postgresql-dd93afca3a0a4c18ac17ee14f7874994f4ced9b5.zip | |
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
| -rw-r--r-- | contrib/sepgsql/label.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c index e12a0e8cb66..ba6f5cdcef5 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) */ |