From patchwork Tue Jan 26 18:05:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 8125641 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BCEA49F1C0 for ; Tue, 26 Jan 2016 18:05:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9F9A20259 for ; Tue, 26 Jan 2016 18:05:44 +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 EA8142024F for ; Tue, 26 Jan 2016 18:05:43 +0000 (UTC) Received: from localhost ([::1]:45706 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO7zq-00074t-GN for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jan 2016 13:05:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO7zj-00074b-4N for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:05:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO7zi-0008Hu-6d for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:05:35 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:59621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO7zh-0008H6-Vl for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:05:34 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1aO7zf-0000BH-AD; Tue, 26 Jan 2016 18:05:31 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 26 Jan 2016 18:05:30 +0000 Message-Id: <1453831531-667-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1453831531-667-1-git-send-email-peter.maydell@linaro.org> References: <1453831531-667-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:8b0:1d0::1 Cc: "Edgar E. Iglesias" , patches@linaro.org Subject: [Qemu-devel] [PATCH 1/2] disas/microblaze.c: Don't define TRUE or FALSE 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 TRUE and FALSE locally or manually include stdio.h; instead use osdep.h which provides them. This is a necessary prerequisite for moving to "everywhere includes osdep.h", because otherwise there is a compile error due to the redefinition of TRUE and FALSE. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake --- disas/microblaze.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/disas/microblaze.c b/disas/microblaze.c index 5d15907..91b30ac 100644 --- a/disas/microblaze.c +++ b/disas/microblaze.c @@ -33,13 +33,10 @@ along with this program; if not, see . */ */ -#include +#include "qemu/osdep.h" #define STATIC_TABLE #define DEFINE_TABLE -#define TRUE 1 -#define FALSE 0 - #ifndef MICROBLAZE_OPC #define MICROBLAZE_OPC /* Assembler instructions for Xilinx's microblaze processor