Parcourir la source

perf tools: Fix non-newt build

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@samba.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1268438710-32697-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Arnaldo Carvalho de Melo il y a 15 ans
Parent
commit
567e54790e
3 fichiers modifiés avec 10 ajouts et 2 suppressions
  1. 2 0
      tools/perf/perf.c
  2. 8 0
      tools/perf/util/debug.h
  3. 0 2
      tools/perf/util/newt.c

+ 2 - 0
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]";
 

+ 8 - 0
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 */

+ 0 - 2
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))