Skip to content

Commit

Permalink
perf annotate: Fix build with NO_NEWT=1
Browse files Browse the repository at this point in the history
Commit 18c9e5c "Make it to be able to skip unannotatable symbols" broke
the build with NO_NEWT=1:

   CC builtin-annotate.o
builtin-annotate.c: In function 'hists__find_annotations':
builtin-annotate.c:161:4: error: duplicate case value
builtin-annotate.c:154:4: error: previously used here
make: *** [builtin-annotate.o] Error 1

This is because without NEWT support K_LEFT is #defined to -1 in
utils/hist.h

Fix it by shifting the K_LEFT/K_RIGHT #defines out of the likely range
of error values.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1361854923-1814-1-git-send-email-michael@ellerman.id.au
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Michael Ellerman authored and Arnaldo Carvalho de Melo committed Mar 13, 2013
1 parent cb16b91 commit 1e825ef
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/perf/util/hist.h
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ static inline int script_browse(const char *script_opt __maybe_unused)
return 0;
}

#define K_LEFT -1
#define K_RIGHT -2
#define K_LEFT -1000
#define K_RIGHT -2000
#endif

#ifdef GTK2_SUPPORT
Expand Down

0 comments on commit 1e825ef

Please sign in to comment.