From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21833 invoked by alias); 15 Mar 2010 18:47:09 -0000 Received: (qmail 21817 invoked by uid 22791); 15 Mar 2010 18:47:08 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 15 Mar 2010 18:47:00 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 667101B4096 for ; Mon, 15 Mar 2010 18:46:58 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH v2] sim: avoid TRACE redefine warnings Date: Mon, 15 Mar 2010 18:47:00 -0000 Message-Id: <1268678817-11407-1-git-send-email-vapier@gentoo.org> In-Reply-To: <1268599156-23584-1-git-send-email-vapier@gentoo.org> References: <1268599156-23584-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-03/txt/msg00555.txt.bz2 The common code sets up an autoconf option --enable-sim-trace which adds -DTRACE= to CPPFLAGS. This causes warnings in the building of some files that declare a local TRACE() helper macro. So punt it from hw-ports.c (since it isn't actually used) and convert hw-properties.c to HW_TRACE(). Signed-off-by: Mike Frysinger --- v2 - convert hw-properties.c to HW_TRACE 2010-03-15 Mike Frysinger * hw-ports.c (TRACE): Delete. * hw-properties.c (TRACE): Delete. (hw_find_ihandle_runtime_property): Change TRACE to HW_TRACE. (hw_find_integer_property): Likewise. (hw_find_integer_array_property): Likewise. (hw_add_duplicate_property): Likewise. sim/common/hw-ports.c | 2 -- sim/common/hw-properties.c | 18 ++++-------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/sim/common/hw-ports.c b/sim/common/hw-ports.c index 8d5c14e..8f88cb3 100644 --- a/sim/common/hw-ports.c +++ b/sim/common/hw-ports.c @@ -35,8 +35,6 @@ along with this program. If not, see . */ #include -#define TRACE(x,y) - struct hw_port_edge { int my_port; diff --git a/sim/common/hw-properties.c b/sim/common/hw-properties.c index 3166e42..018a84c 100644 --- a/sim/common/hw-properties.c +++ b/sim/common/hw-properties.c @@ -33,8 +33,6 @@ #endif #endif -#define TRACE(A,B) - /* property entries */ struct hw_property_data { @@ -418,9 +416,7 @@ hw_find_ihandle_runtime_property (struct hw *me, ihandle_runtime_property_spec *ihandle) { struct hw_property_data *entry = find_property_data (me, property); - TRACE (trace_devices, - ("hw_find_ihandle_runtime_property(me=0x%lx, property=%s)\n", - (long)me, property)); + HW_TRACE ((me, "hw_find_ihandle_runtime_property(property=%s)\n", property)); if (entry == NULL) hw_abort (me, "property \"%s\" not found", property); if (entry->property->type != ihandle_property @@ -492,9 +488,7 @@ hw_find_integer_property (struct hw *me, { const struct hw_property *node; signed_cell integer; - TRACE (trace_devices, - ("hw_find_integer(me=0x%lx, property=%s)\n", - (long)me, property)); + HW_TRACE ((me, "hw_find_integer(property=%s)\n", property)); node = hw_find_property (me, property); if (node == NULL) hw_abort (me, "property \"%s\" not found", property); @@ -514,9 +508,7 @@ hw_find_integer_array_property (struct hw *me, const struct hw_property *node; int sizeof_integer = sizeof (*integer); signed_cell *cell; - TRACE (trace_devices, - ("hw_find_integer(me=0x%lx, property=%s)\n", - (long)me, property)); + HW_TRACE ((me, "hw_find_integer(property=%s)\n", property)); /* check things sane */ node = hw_find_property (me, property); @@ -886,9 +878,7 @@ hw_add_duplicate_property (struct hw *me, const struct hw_property *original) { struct hw_property_data *master; - TRACE (trace_devices, - ("hw_add_duplicate_property(me=0x%lx, property=%s, ...)\n", - (long)me, property)); + HW_TRACE ((me, "hw_add_duplicate_property(property=%s, ...)\n", property)); if (original->disposition != permenant_object) hw_abort (me, "Can only duplicate permenant objects"); /* find the original's master */ -- 1.7.0