From patchwork Tue Feb 9 15:25:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 8263121 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3B7B6BEEE5 for ; Tue, 9 Feb 2016 15:57:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A8BA020254 for ; Tue, 9 Feb 2016 15:57:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 05DF320270 for ; Tue, 9 Feb 2016 15:57:11 +0000 (UTC) Received: from localhost ([::1]:57388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTAf8-0007E1-GI for patchwork-qemu-devel@patchwork.kernel.org; Tue, 09 Feb 2016 10:57:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTAbB-0000Yt-5G for qemu-devel@nongnu.org; Tue, 09 Feb 2016 10:53:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTAb7-00077J-5u for qemu-devel@nongnu.org; Tue, 09 Feb 2016 10:53:05 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:57247) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTAb7-00076J-03 for qemu-devel@nongnu.org; Tue, 09 Feb 2016 10:53:01 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.84) (envelope-from ) id 1aTAAC-0006B3-7c; Tue, 09 Feb 2016 15:25:12 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 9 Feb 2016 15:25:05 +0000 Message-Id: <1455031511-23684-9-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1455031511-23684-1-git-send-email-peter.maydell@linaro.org> References: <1455031511-23684-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::1 Cc: patches@linaro.org Subject: [Qemu-devel] [PATCH 08/14] tests/i440fx-test: Don't define ARRAY_SIZE locally X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Don't define ARRAY_SIZE locally; instead include osdep.h for it. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake --- tests/i440fx-test.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c index 7fa1709..0665caf 100644 --- a/tests/i440fx-test.c +++ b/tests/i440fx-test.c @@ -12,6 +12,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include #include @@ -27,8 +28,6 @@ #define BROKEN 1 -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - typedef struct TestData { int num_cpus;