From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19315 invoked by alias); 14 Mar 2010 20:37:46 -0000 Received: (qmail 19305 invoked by uid 22791); 14 Mar 2010 20:37:45 -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; Sun, 14 Mar 2010 20:37:41 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 6C2671B4019 for ; Sun, 14 Mar 2010 20:37:39 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: avoid TRACE redefine warnings Date: Sun, 14 Mar 2010 20:37:00 -0000 Message-Id: <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/msg00504.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 rename it in hw-properties.c. Signed-off-by: Mike Frysinger --- 2010-03-14 Mike Frysinger * hw-ports.c (TRACE): Delete. * hw-properties.c (TRACE): Rename to _TRACE. sim/common/hw-ports.c | 2 -- sim/common/hw-properties.c | 10 +++++----- 2 files changed, 5 insertions(+), 7 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..b7d4009 100644 --- a/sim/common/hw-properties.c +++ b/sim/common/hw-properties.c @@ -33,7 +33,7 @@ #endif #endif -#define TRACE(A,B) +#define _TRACE(A,B) /* property entries */ @@ -418,7 +418,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, + _TRACE (trace_devices, ("hw_find_ihandle_runtime_property(me=0x%lx, property=%s)\n", (long)me, property)); if (entry == NULL) @@ -492,7 +492,7 @@ hw_find_integer_property (struct hw *me, { const struct hw_property *node; signed_cell integer; - TRACE (trace_devices, + _TRACE (trace_devices, ("hw_find_integer(me=0x%lx, property=%s)\n", (long)me, property)); node = hw_find_property (me, property); @@ -514,7 +514,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, + _TRACE (trace_devices, ("hw_find_integer(me=0x%lx, property=%s)\n", (long)me, property)); @@ -886,7 +886,7 @@ hw_add_duplicate_property (struct hw *me, const struct hw_property *original) { struct hw_property_data *master; - TRACE (trace_devices, + _TRACE (trace_devices, ("hw_add_duplicate_property(me=0x%lx, property=%s, ...)\n", (long)me, property)); if (original->disposition != permenant_object) -- 1.7.0