[PATCH 1/1] perf tools: Fix non-newt build

From: Arnaldo Carvalho de Melo
Date: Fri Mar 12 2010 - 19:05:30 EST


From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

The use_browser needs to be in a file that is always built and also we
need a browser__show_help stub in that case.

Reported-by: Anton Blanchard <anton@xxxxxxxxx>
Cc: FrÃdÃric Weisbecker <fweisbec@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/perf.c | 2 ++
tools/perf/util/debug.h | 8 ++++++++
tools/perf/util/newt.c | 2 --
3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 9ff186b..0d4b9ed 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -16,6 +16,8 @@
#include "util/string.h"
#include "util/debugfs.h"

+bool use_browser;
+
const char perf_usage_string[] =
"perf [--version] [--help] COMMAND [ARGS]";

diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h
index 03accb8..0172edf 100644
--- a/tools/perf/util/debug.h
+++ b/tools/perf/util/debug.h
@@ -9,6 +9,14 @@ extern int dump_trace;

int dump_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
void trace_event(event_t *event);
+
+#ifdef NO_NEWT_SUPPORT
+static inline int browser__show_help(const char *format __used, va_list ap __used)
+{
+ return 0;
+}
+#else
int browser__show_help(const char *format, va_list ap);
+#endif

#endif /* __PERF_DEBUG_H */
diff --git a/tools/perf/util/newt.c b/tools/perf/util/newt.c
index f6ec6f5..2836394 100644
--- a/tools/perf/util/newt.c
+++ b/tools/perf/util/newt.c
@@ -189,8 +189,6 @@ int browser__show_help(const char *format, va_list ap)
return ret;
}

-bool use_browser;
-
void setup_browser(void)
{
if (!isatty(1))
--
1.6.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/