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 150D3C43334 for ; Tue, 12 Jul 2022 09:57:01 +0000 (UTC) Received: from localhost ([::1]:56910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBCdY-0002mw-6E for qemu-devel@archiver.kernel.org; Tue, 12 Jul 2022 05:57:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBCKa-0006HV-Le for qemu-devel@nongnu.org; Tue, 12 Jul 2022 05:37:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:25818) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBCKE-0001gj-Ai for qemu-devel@nongnu.org; Tue, 12 Jul 2022 05:37:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657618621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ECB1rjXtaOld755Ej47L1U6FtyhUddpB7HqdBC6SqTw=; b=IUmwh0JOprIoHiRnxbRb6tS/3adkHefq61/R4ETtmmGxzROsfZVEQFy3y7LuCIHBcOhHGu +2ajWTEJklJidJOdofU2jrC5uaxV1JNJt4HCvmfNHzs2PgDqW5g+F+zZGskeub2SZVqaiP V1xl7x3Anh22KS/PLK/lm0Ltd4nwbYM= 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-629-E0IAtwoQNEWSS5ZUlZhvuA-1; Tue, 12 Jul 2022 05:36:55 -0400 X-MC-Unique: E0IAtwoQNEWSS5ZUlZhvuA-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 9744D85A584; Tue, 12 Jul 2022 09:36:54 +0000 (UTC) Received: from localhost (unknown [10.39.208.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A4241415117; Tue, 12 Jul 2022 09:36:52 +0000 (UTC) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Eric Blake , Cleber Rosa , qemu-block@nongnu.org, Paolo Bonzini , Xie Yongji , Kyle Evans , Peter Maydell , John Snow , Michael Roth , Warner Losh , Kevin Wolf , "Dr. David Alan Gilbert" , Markus Armbruster , Vladimir Sementsov-Ogievskiy , Laurent Vivier , Fam Zheng , Hanna Reitz , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 12/15] qemu-common: move glib-compat.h Date: Tue, 12 Jul 2022 13:35:25 +0400 Message-Id: <20220712093528.4144184-13-marcandre.lureau@redhat.com> In-Reply-To: <20220712093528.4144184-1-marcandre.lureau@redhat.com> References: <20220712093528.4144184-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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" From: Marc-André Lureau qemu-common will have compatible dependency requirements with QEMU. Since qemu-common won't have a toplevel qemu/osdep.h which would include various system headers, include stdbool.h (bool is used for some declarations here). Replace getenv() with g_getenv() to avoid extra header inclusion. Signed-off-by: Marc-André Lureau --- {include => subprojects/qemu-common/include}/glib-compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename {include => subprojects/qemu-common/include}/glib-compat.h (97%) diff --git a/include/glib-compat.h b/subprojects/qemu-common/include/glib-compat.h similarity index 97% rename from include/glib-compat.h rename to subprojects/qemu-common/include/glib-compat.h index 43a562974d80..2b0f2962f322 100644 --- a/include/glib-compat.h +++ b/subprojects/qemu-common/include/glib-compat.h @@ -30,6 +30,8 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #include +#include + #if defined(G_OS_UNIX) #include #include @@ -133,7 +135,7 @@ qemu_g_test_slow(void) { static int cached = -1; if (cached == -1) { - cached = g_test_slow() || getenv("G_TEST_SLOW") != NULL; + cached = g_test_slow() || g_getenv("G_TEST_SLOW") != NULL; } return cached; } -- 2.37.0.rc0