On Mon, Aug 06, 2012 at 01:13:56PM +0300, Alexander Shishkin wrote: > Commit 2cfaf9cc68190c24fdd05e4d104099b3f27c7a44 (rbtree: adjust root color > in rb_insert_color() only when necessary) introduces bool type and constants > to the rbtree.c, and breaks compilation of tools/perf: > > > ../../lib/rbtree.c: In function ‘rb_insert_color’: > > ../../lib/rbtree.c:95:9: error: ‘true’ undeclared (first use in this function) > > ../../lib/rbtree.c:95:9: note: each undeclared identifier is reported only once > > for each function it appears in > > ../../lib/rbtree.c: In function ‘__rb_erase_color’: > > ../../lib/rbtree.c:216:9: error: ‘true’ undeclared (first use in this function) > > ../../lib/rbtree.c: In function ‘rb_erase’: > > ../../lib/rbtree.c:368:2: error: unknown type name ‘bool’ > > make: *** [util/rbtree.o] Error 1 > > This patch is the easiest solution I can think of. > > Signed-off-by: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> > --- > tools/perf/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/Makefile b/tools/perf/Makefile > index 77f124f..2f7a86c 100644 > --- a/tools/perf/Makefile > +++ b/tools/perf/Makefile > @@ -802,7 +802,7 @@ $(OUTPUT)ui/browsers/map.o: ui/browsers/map.c $(OUTPUT)PERF-CFLAGS > $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $< > > $(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS > - $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< > + $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' -include stdbool.h $< > > $(OUTPUT)util/parse-events.o: util/parse-events.c $(OUTPUT)PERF-CFLAGS > $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-redundant-decls $< > -- Acked-by: Michel Lespinasse <walken@xxxxxxxxxx> Copying Andrew as this probably needs to go through his tree along with the rbtree patches. -- Michel "Walken" Lespinasse A program is never fully debugged until the last user dies. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
