diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-25 21:40:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-25 21:40:40 +0200 |
| commit | d431adfbc9b7de651f3164c6b7ffcad75805d7e4 (patch) | |
| tree | 29bce222c81a3a392e51c11e2188659aa6d1bded /tools/perf/util/debug.c | |
| parent | d6250a3f12edb3a86db9598ffeca3de8b4a219e9 (diff) | |
| parent | e2b34e311be3a57c9abcb927e37a57e38913714c (diff) | |
Merge branch 'linus' into x86/urgent
Merge in Linus's tree to avoid a conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/debug.c')
| -rw-r--r-- | tools/perf/util/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c index efb1fce259a4..4dfe0bb3c322 100644 --- a/tools/perf/util/debug.c +++ b/tools/perf/util/debug.c @@ -47,7 +47,7 @@ int dump_printf(const char *fmt, ...) return ret; } -#ifdef NO_NEWT_SUPPORT +#if defined(NO_NEWT_SUPPORT) && defined(NO_GTK2_SUPPORT) int ui__warning(const char *format, ...) { va_list args; |