[cairo-commit] 2 commits - meson.build

[GitLab Mirror]

 meson.build |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ed017e10f9c21b69ede1346e97f2ff0333d5465e
Merge: 69fdca480 3ee18ffc2
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat Aug 7 05:37:30 2021 +0000

    Merge branch 'STRNDUP-bug' into 'master'
    
    Added extra check for HAVE_STRNDUP in Win32 Mingw Meson build
    
    See merge request cairo/cairo!226

commit 3ee18ffc28be480b1c8bfb072f73a991734b3c25
Author: Rick Yorgason <rick at firefang.com>
Date:   Sun Aug 1 17:30:06 2021 -0700

    Added extra check for HAVE_STRNDUP in Win32 Mingw Meson build
    
    Mingw on Windows defines the strndup function, but it's not actually usable because string.h doesn't exist. See details on the Meson bug here: https://github.com/mesonbuild/meson/issues/3672
    
    Note that although Meson marked this bug as "fixed", it's only fixed in the case where you're using `prefix : '#include <string.h>'`.

diff --git a/meson.build b/meson.build
index 5ddf7868b..f3ff3b4b8 100644
--- a/meson.build
+++ b/meson.build
@@ -115,7 +115,6 @@ check_funcs = [
   'funlockfile',
   'getline',
   'link',
-  'strndup',
   'fork',
   'waitpid',
   'raise',
@@ -820,6 +819,8 @@ foreach name : check_funcs
   endif
 endforeach
 
+conf.set('HAVE_STRNDUP', cc.has_function('strndup', prefix : '#include <string.h>'))
+
 pthread_c_args = []
 pthread_link_args = []