util: Fix broken build on Haiku
PATCH 1/1 util: Fix broken build on Haiku
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.
--- util/cutils.c | 4 ++++ util/oslib-posix.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)
util/cutils.c +4 -0
@@ -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>
util/oslib-posix.c +0 -4
@@ -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
Signature · 1 line
2.31.1
Quoted 8 lines · Thomas Huth
A recent commit moved some Haiku-specific code parts from
oslib-posix.ctocutils.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]>
Quoted 40 lines
--- util/cutils.c | 4 ++++ util/oslib-posix.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)util/cutils.c +4
-0@@ -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> util/oslib-posix.c +0
-5@@ -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
Signature · 1 line
Marc-André Lureau
Quoted 8 lines · Thomas Huth
A recent commit moved some Haiku-specific code parts from
oslib-posix.ctocutils.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]>
Thanks for this one !!
--js
Paolo Bonzini
AppliedQueued, thanks.
Paolo