From 8e52c99a84c1a16bae788a3f4307e4d2285b8e99 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Mon, 4 Apr 2022 18:48:58 -0700 Subject: [PATCH] =?utf8?q?LASi=20plugin:=20work=20around=20LASi=20exportin?= =?utf8?q?g=20Freetype=E2=80=99s=20config.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- plugin/lasi/gvrender_lasi.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/plugin/lasi/gvrender_lasi.cpp b/plugin/lasi/gvrender_lasi.cpp index 0534ab7c6..319f9544e 100644 --- a/plugin/lasi/gvrender_lasi.cpp +++ b/plugin/lasi/gvrender_lasi.cpp @@ -8,13 +8,22 @@ * Contributors: Details at https://graphviz.org *************************************************************************/ -#include "config.h" - #include #include #include #include +// Confusingly, Freetype (included transitively by LASi), ship their Autotools +// config.h. As a result, we get macros like `HAVE_FCNTL_H` injected from their +// headers, overriding ours. Suppress this and force ours into scope. +#ifdef HAVE_FCNTL_H +#undef HAVE_FCNTL_H +#endif +#ifdef HAVE_UNISTD_H +#undef HAVE_UNISTD_H +#endif +#include "config.h" + #include #include #include -- 2.50.1