[cairo-commit] 2 commits - src/cairo-colr-glyph-render.c

[GitLab Mirror]

 src/cairo-colr-glyph-render.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 29592a331c947737e688d095f5f8a2ee77b666f5
Merge: 459d19ef1 27cdee5e4
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Mon Oct 2 05:14:44 2023 +0000

    Merge branch 'msvc-alloca-fix' into 'master'
    
    Fix alloca undefined with MSVC
    
    Closes #808
    
    See merge request cairo/cairo!520

commit 27cdee5e4cf19e7959b80fe1a39e61188de1b654
Author: Dan Yeaw <dan at yeaw.me>
Date:   Sat Sep 30 13:30:51 2023 -0400

    Fix alloca undefined with MSVC
    
    Conditionally includes malloc.h when compiling with
    MSVC so that alloca is defined.

diff --git a/src/cairo-colr-glyph-render.c b/src/cairo-colr-glyph-render.c
index 28254fd51..a9ad84bbf 100644
--- a/src/cairo-colr-glyph-render.c
+++ b/src/cairo-colr-glyph-render.c
@@ -43,6 +43,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef _MSC_VER
+#include <malloc.h>
+#endif
+
 #if HAVE_FT_COLR_V1
 
 #include <ft2build.h>