From 465edd7b6873e2f541e85cffb238adf92295ca30 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 12 Mar 2010 21:05:10 -0300
Subject: [PATCH] --- yaml --- r: 191087 b: refs/heads/master c:
 567e54790e5c07152a93b6de4d0210af8b77da87 h: refs/heads/master i:   191085:
 c6fa34ba297ebc5bb4fa04cad0c46a0aa5124b7c   191083:
 954bf9d2f681c1ac0eccf22a1431abd54e211f79   191079:
 188a8ebf7486bbd5676c5c10adb3f0abd2708c75   191071:
 2264c1382821726e0236a05edafd617216fe7fdc v: v3

---
 [refs]                        | 2 +-
 trunk/tools/perf/perf.c       | 2 ++
 trunk/tools/perf/util/debug.h | 8 ++++++++
 trunk/tools/perf/util/newt.c  | 2 --
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 307af43a6b37..d2f8379a6728 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0308635917273030db6121d67c41ef2279b30340
+refs/heads/master: 567e54790e5c07152a93b6de4d0210af8b77da87
diff --git a/trunk/tools/perf/perf.c b/trunk/tools/perf/perf.c
index 9ff186b57cb7..0d4b9edfab12 100644
--- a/trunk/tools/perf/perf.c
+++ b/trunk/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/trunk/tools/perf/util/debug.h b/trunk/tools/perf/util/debug.h
index 03accb867996..0172edf3f153 100644
--- a/trunk/tools/perf/util/debug.h
+++ b/trunk/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/trunk/tools/perf/util/newt.c b/trunk/tools/perf/util/newt.c
index f6ec6f5c0fd9..2836394459d9 100644
--- a/trunk/tools/perf/util/newt.c
+++ b/trunk/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))