2 commits - meson.build src/cairo-colr-glyph-render.c

[GitLab Mirror]

 meson.build                   |    1 +
 src/cairo-colr-glyph-render.c |    4 ++++
 2 files changed, 5 insertions(+)

New commits:
commit 3e12dfda3c55a310ad6f0d67b91cf8df8890fd61
Merge: 9a05c9c36 44e4e1123
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Tue Apr 16 00:36:42 2024 +0000

    Merge branch 'alloca' into 'master'
    
    Fix alloca undefined on Solaris
    
    See merge request cairo/cairo!540

commit 44e4e1123668f1e345dc7f5d5a45ef1a16979314
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Apr 14 09:34:37 2024 -0700

    Fix alloca undefined on Solaris
    
    Solaris defines alloca in the <alloca.h> header
    
    ../src/cairo-colr-glyph-render.c: In function ‘add_sweep_gradient_patches’:
    ../src/cairo-colr-glyph-render.c:661:14: error: implicit declaration of
     function ‘alloca’ [-Werror=implicit-function-declaration]
      661 |     angles = alloca (sizeof (double) * cl->n_stops);
          |              ^~~~~~
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

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>