| Message ID | 20210309002741.85057-3-j@getutm.app (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Disable unsupported features on iOS hosts | expand |
On Tue, 9 Mar 2021 at 00:31, Joelle van Dyne <j@getutm.app> wrote: > > Some BSD platforms do not have this header. > > Signed-off-by: Joelle van Dyne <j@getutm.app> > --- Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On 3/9/21 1:27 AM, Joelle van Dyne wrote: > Some BSD platforms do not have this header. > > Signed-off-by: Joelle van Dyne <j@getutm.app> > --- > meson.build | 1 + > block.c | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meson.build b/meson.build > index 0e53876f69..ba0db9fa1f 100644 > --- a/meson.build > +++ b/meson.build > @@ -1153,6 +1153,7 @@ config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) > config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h')) > config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>')) > config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device) > +config_host_data.set('HAVE_SYS_DISK_H', cc.has_header('sys/disk.h')) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/meson.build b/meson.build index 0e53876f69..ba0db9fa1f 100644 --- a/meson.build +++ b/meson.build @@ -1153,6 +1153,7 @@ config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h')) config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>')) config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device) +config_host_data.set('HAVE_SYS_DISK_H', cc.has_header('sys/disk.h')) config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#include <sys/uio.h>')) diff --git a/block.c b/block.c index a1f3cecd75..b2705ad225 100644 --- a/block.c +++ b/block.c @@ -54,7 +54,7 @@ #ifdef CONFIG_BSD #include <sys/ioctl.h> #include <sys/queue.h> -#ifndef __DragonFly__ +#if defined(HAVE_SYS_DISK_H) #include <sys/disk.h> #endif #endif
Some BSD platforms do not have this header. Signed-off-by: Joelle van Dyne <j@getutm.app> --- meson.build | 1 + block.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)