diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2024-04-16 00:36:42 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2024-04-16 00:36:42 +0000 |
| commit | 3e12dfda3c55a310ad6f0d67b91cf8df8890fd61 (patch) | |
| tree | 726768f5a495c01e03d2a8c2c2e5bbb7353f4ef7 | |
| parent | 9a05c9c3685ff90677f6adf83d2a40ea608d03fb (diff) | |
| parent | 44e4e1123668f1e345dc7f5d5a45ef1a16979314 (diff) | |
Merge branch 'alloca' into 'master'
Fix alloca undefined on Solaris
See merge request cairo/cairo!540
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | src/cairo-colr-glyph-render.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/meson.build b/meson.build index 2e351749c..03eb140f0 100644 --- a/meson.build +++ b/meson.build @@ -135,6 +135,7 @@ check_headers = [ ['xlocale.h'], ['sys/ioctl.h'], ['intsafe.h'], + ['alloca.h'], ] check_types = [ diff --git a/src/cairo-colr-glyph-render.c b/src/cairo-colr-glyph-render.c index a9ad84bbf..89e27354b 100644 --- a/src/cairo-colr-glyph-render.c +++ b/src/cairo-colr-glyph-render.c @@ -47,6 +47,10 @@ #include <malloc.h> #endif +#ifdef HAVE_ALLOCA_H +#include <alloca.h> +#endif + #if HAVE_FT_COLR_V1 #include <ft2build.h> |