Skip to content

Commit 39cb6d1

Browse files
meson.build: use has_header_symbol() instead of get_define() to improve compatibility
Signed-off-by: DreamConnected <1487442471@qq.com>
1 parent 0267998 commit 39cb6d1

1 file changed

Lines changed: 8 additions & 16 deletions

File tree

meson.build

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -710,71 +710,63 @@ else
710710
missing_types += 'struct mount_attr (sys/mount.h)' endif
711711

712712
## Check if sys/mount.h defines the fsconfig commands
713-
if cc.get_define('FSCONFIG_SET_FLAG', prefix: decl_headers) != '' or \
714-
cc.has_header_symbol('sys/mount.h','FSCONFIG_SET_FLAG')
713+
if cc.has_header_symbol('sys/mount.h','FSCONFIG_SET_FLAG')
715714
srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), true)
716715
found_types += 'FSCONFIG_SET_FLAG (sys/mount.h)'
717716
else
718717
srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), false)
719718
missing_types += 'FSCONFIG_SET_FLAG (sys/mount.h)'
720719
endif
721720

722-
if cc.get_define('FS_CONFIG_SET_STRING', prefix: decl_headers) != '' or \
723-
cc.has_header_symbol('sys/mount.h','FSCONFIG_SET_STRING')
721+
if cc.has_header_symbol('sys/mount.h','FSCONFIG_SET_STRING')
724722
srcconf.set10('HAVE_' + 'FSCONFIG_SET_STRING'.underscorify().to_upper(), true)
725723
found_types += 'FSCONFIG_SET_STRING (sys/mount.h)'
726724
else
727725
srcconf.set10('HAVE_' + 'FSCONFIG_SET_STRING'.underscorify().to_upper(), false)
728726
missing_types += 'FSCONFIG_SET_STRING (sys/mount.h)'
729727
endif
730728

731-
if cc.get_define('FS_CONFIG_SET_BINARY', prefix: decl_headers) != '' or \
732-
cc.has_header_symbol('sys/mount.h','FSCONFIG_SET_BINARY')
729+
if cc.has_header_symbol('sys/mount.h','FSCONFIG_SET_BINARY')
733730
srcconf.set10('HAVE_' + 'FSCONFIG_SET_BINARY'.underscorify().to_upper(), true)
734731
found_types += 'FSCONFIG_SET_BINARY (sys/mount.h)'
735732
else
736733
srcconf.set10('HAVE_' + 'FSCONFIG_SET_BINARY'.underscorify().to_upper(), false)
737734
missing_types += 'FSCONFIG_SET_BINARY (sys/mount.h)'
738735
endif
739736

740-
if cc.get_define('FS_CONFIG_SET_PATH', prefix: decl_headers) != '' or \
741-
cc.has_header_symbol('sys/mount.h','FSCONFIG_SET_PATH')
737+
if cc.has_header_symbol('sys/mount.h','FSCONFIG_SET_PATH')
742738
srcconf.set10('HAVE_' + 'FSCONFIG_SET_PATH'.underscorify().to_upper(), true)
743739
found_types += 'FSCONFIG_SET_PATH (sys/mount.h)'
744740
else
745741
srcconf.set10('HAVE_' + 'FSCONFIG_SET_PATH'.underscorify().to_upper(), false)
746742
missing_types += 'FSCONFIG_SET_PATH (sys/mount.h)'
747743
endif
748744

749-
if cc.get_define('FS_CONFIG_SET_PATH_EMPTY', prefix: decl_headers) != '' or \
750-
cc.has_header_symbol('sys/mount.h','FSCONFIG_SET_PATH_EMPTY')
745+
if cc.has_header_symbol('sys/mount.h','FSCONFIG_SET_PATH_EMPTY')
751746
srcconf.set10('HAVE_' + 'FSCONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), true)
752747
found_types += 'FSCONFIG_SET_PATH_EMPTY (sys/mount.h)'
753748
else
754749
srcconf.set10('HAVE_' + 'FSCONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), false)
755750
missing_types += 'FSCONFIG_SET_PATH_EMPTY (sys/mount.h)'
756751
endif
757752

758-
if cc.get_define('FS_CONFIG_SET_PATH_FD', prefix: decl_headers) != '' or \
759-
cc.has_header_symbol('sys/mount.h','FSCONFIG_SET_FD')
753+
if cc.has_header_symbol('sys/mount.h','FSCONFIG_SET_FD')
760754
srcconf.set10('HAVE_' + 'FSCONFIG_SET_FD'.underscorify().to_upper(), true)
761755
found_types += 'FSCONFIG_SET_FD (sys/mount.h)'
762756
else
763757
srcconf.set10('HAVE_' + 'FSCONFIG_SET_FD'.underscorify().to_upper(), false)
764758
missing_types += 'FSCONFIG_SET_FD (sys/mount.h)'
765759
endif
766760

767-
if cc.get_define('FS_CONFIG_SET_CMD_CREATE', prefix: decl_headers) != '' or \
768-
cc.has_header_symbol('sys/mount.h','FSCONFIG_CMD_CREATE')
761+
if cc.has_header_symbol('sys/mount.h','FSCONFIG_CMD_CREATE')
769762
srcconf.set10('HAVE_' + 'FSCONFIG_CMD_CREATE'.underscorify().to_upper(), true)
770763
found_types += 'FSCONFIG_CMD_CREATE (sys/mount.h)'
771764
else
772765
srcconf.set10('HAVE_' + 'FSCONFIG_CMD_CREATE'.underscorify().to_upper(), false)
773766
missing_types += 'FSCONFIG_CMD_CREATE (sys/mount.h)'
774767
endif
775768

776-
if cc.get_define('FS_CONFIG_SET_CMD_RECONFIGURE', prefix: decl_headers) != '' or \
777-
cc.has_header_symbol('sys/mount.h','FSCONFIG_CMD_RECONFIGURE')
769+
if cc.has_header_symbol('sys/mount.h','FSCONFIG_CMD_RECONFIGURE')
778770
srcconf.set10('HAVE_' + 'FSCONFIG_CMD_RECONFIGURE'.underscorify().to_upper(), true)
779771
found_types += 'FSCONFIG_CMD_RECONFIGURE (sys/mount.h)'
780772
else

0 commit comments

Comments
 (0)