From 2c0888f69c247c82fc02ba207aa19fa00acf4b5e Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Sun, 19 Jun 2022 12:48:01 +0200 Subject: [PATCH] Including iff it exists. With NXT_HAVE_PIVOT_ROOT, we had issues in MacOS. Headers should normally be included unconditionally, except of course if they don't exist. This fixes part of the #737 issue on GitHub. --- auto/isolation | 13 +++++++++++++ src/nxt_isolation.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/auto/isolation b/auto/isolation index 4ade6a38..6debdc3b 100644 --- a/auto/isolation +++ b/auto/isolation @@ -73,6 +73,19 @@ nxt_feature_test="#include . auto/feature +nxt_feature="" +nxt_feature_name=NXT_HAVE_MNTENT_H +nxt_feature_run=no +nxt_feature_incs= +nxt_feature_libs= +nxt_feature_test="#include + + int main(void) { + return 0; + }" +. auto/feature + + nxt_feature="prctl(PR_SET_NO_NEW_PRIVS)" nxt_feature_name=NXT_HAVE_PR_SET_NO_NEW_PRIVS0 nxt_feature_run=no diff --git a/src/nxt_isolation.c b/src/nxt_isolation.c index 7bb8dbfd..5a0714ff 100644 --- a/src/nxt_isolation.c +++ b/src/nxt_isolation.c @@ -7,7 +7,7 @@ #include #include -#if (NXT_HAVE_PIVOT_ROOT) +#if (NXT_HAVE_MNTENT_H) #include #endif