From d64f60c733980fb18437f41e1bc791a5d1ccb536 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 25 Oct 2019 10:39:02 -0400 Subject: feat(3p/nix): meson: Define HAVE_STRUCT_DIRENT_D_TYPE macro (cherry picked from commit 7ae66bbef5e92f4a0bba49780d8c316f134884f2) --- third_party/nix/meson.build | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'third_party') diff --git a/third_party/nix/meson.build b/third_party/nix/meson.build index 8458312569..abfed14cd9 100644 --- a/third_party/nix/meson.build +++ b/third_party/nix/meson.build @@ -163,7 +163,8 @@ if (cpp.has_header('sys/ndir.h')) description : 'Define to 1 if you have the header file, and it defines `DIR`') endif -if (cpp.has_header('dirent.h')) +has_dirent_h = cpp.has_header('dirent.h') +if (has_dirent_h) config_h.set( 'HAVE_DIRENT_H', 1, description : 'Define to 1 if you have the header file, and it defines `DIR`') @@ -309,6 +310,23 @@ if meson.get_compiler('cpp').compiles( description : 'Define to 1 if you have the `pubsetbuf` function.') endif + + +# checking data types +#============================================================================ + + +dirent_h_prefix = ''' + #include + #include +''' + +# Code taken from glib, thanks! +if has_dirent_h and meson.get_compiler('cpp').has_member('struct dirent', 'd_type', prefix: dirent_h_prefix) + define = 'HAVE_STRUCT_@0@_@1@'.format('dirent'.to_upper(), 'd_type'.underscorify().to_upper()) + config_h.set(define, 1) +endif + # required dependancies #============================================================================ @@ -552,4 +570,4 @@ project_dirs = [ foreach dir : project_dirs subdir(dir) -endforeach \ No newline at end of file +endforeach -- cgit 1.4.1