Work around stdbool problem in dfmgr.c.

tglsfdc · tglsfdc · commit ff47d4bf1f20 · 2018-09-09T12:41:27.000-04:00
Commit 842cb9f refactored things so that dfmgr.c includes <dlfcn.h>, which before that had only been directly included in platform-specific stub files. It turns out that on macOS, <dlfcn.h> includes <stdbool.h>, and that causes problems on platforms where _Bool is not char-sized ... which happens to include the PPC versions of macOS. Work around it much as we have in plperl.h, by #undef'ing bool after including the problematic file, but only if we're not using stdbool-style booleans. Discussion: https://postgr.es/m/E1fxqjl-0003YS-NS@gemulon.postgresql.org
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
@@ -18,7 +18,17 @@
 
 #ifdef HAVE_DLOPEN
 #include <dlfcn.h>
+
+/*
+ * On macOS, <dlfcn.h> insists on including <stdbool.h>.  If we're not
+ * using stdbool, undef bool to undo the damage.
+ */
+#ifndef USE_STDBOOL
+#ifdef bool
+#undef bool
+#endif
 #endif
+#endif							/* HAVE_DLOPEN */
 
 #include "fmgr.h"
 #include "lib/stringinfo.h"
