On Mon, Jul 18, 2022 at 9:22 PM Thomas Huth <[email protected]> wrote:
> A recent commit moved some Haiku-specific code parts from oslib-posix.c
> to cutils.c, but failed to move the corresponding header #include
> statement, too, so "make vm-build-haiku.x86_64" is currently broken.
> Fix it by moving the header #include, too.
>
> Fixes: 06680b15b4 ("include: move qemu_*_exec_dir() to cutils")
> Signed-off-by: Thomas Huth <[email protected]>
>
Reviewed-by: Marc-André Lureau <[email protected]>
> ---
> util/cutils.c | 4 ++++
> util/oslib-posix.c | 4 ----
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/util/cutils.c b/util/cutils.c
> index 8199dac598..cb43dda213 100644
> --- a/util/cutils.c
> +++ b/util/cutils.c
> @@ -35,6 +35,10 @@
> #include <sys/sysctl.h>
> #endif
>
> +#ifdef __HAIKU__
> +#include <kernel/image.h>
> +#endif
> +
> #ifdef G_OS_WIN32
> #include <pathcch.h>
> #include <wchar.h>
> diff --git a/util/oslib-posix.c b/util/oslib-posix.c
> index 7a34c1657c..bffec18869 100644
> --- a/util/oslib-posix.c
> +++ b/util/oslib-posix.c
> @@ -62,10 +62,6 @@
> #include <mach-o/dyld.h>
> #endif
>
> -#ifdef __HAIKU__
> -#include <kernel/image.h>
> -#endif
> -
> #include "qemu/mmap-alloc.h"
>
> #ifdef CONFIG_DEBUG_STACK_USAGE
> --
> 2.31.1
>
>
>
--
Marc-André Lureau