From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CC5F6C433EF for ; Mon, 18 Jul 2022 17:23:49 +0000 (UTC) Received: from localhost ([::1]:56698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDUTE-0007Lz-Gk for qemu-devel@archiver.kernel.org; Mon, 18 Jul 2022 13:23:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDUQC-0005gX-VT for qemu-devel@nongnu.org; Mon, 18 Jul 2022 13:20:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:46962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDUQ8-0001Sr-9z for qemu-devel@nongnu.org; Mon, 18 Jul 2022 13:20:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658164835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/DT+yts5ND7sEUSkV7VfF3dJVYZ0K5T2G8XQXQrA54s=; b=PKmT8VipPQsmL4FZfTtLViu6EHVo0RvH7YT6MwOGkpjIb5mMe8en2b5pA5E+ldxcA7fAd0 X+k4K5fKH/+osWm4TnmSwIalnYKv1uedRGAYJDE4rJXb8sDo0IQaZjMDQ9kywEJcf4aRfx d+SnkVY4zOhC+sSKXv5SNmGpKB5zR/c= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-573-strUONQfOF-msXd08p6glg-1; Mon, 18 Jul 2022 13:20:32 -0400 X-MC-Unique: strUONQfOF-msXd08p6glg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BC4838037A9; Mon, 18 Jul 2022 17:20:31 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A3AA141511A; Mon, 18 Jul 2022 17:20:29 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Alexander von Gluck IV Subject: [PATCH] util: Fix broken build on Haiku Date: Mon, 18 Jul 2022 19:20:26 +0200 Message-Id: <20220718172026.139004-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- 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 #endif +#ifdef __HAIKU__ +#include +#endif + #ifdef G_OS_WIN32 #include #include 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 #endif -#ifdef __HAIKU__ -#include -#endif - #include "qemu/mmap-alloc.h" #ifdef CONFIG_DEBUG_STACK_USAGE -- 2.31.1