1d037ca164
perf defines both __used and __unused variables to use for marking
unused variables. The variable __used is defined to
__attribute__((__unused__)), which contradicts the kernel definition to
__attribute__((__used__)) for new gcc versions. On Android, __used is
also defined in system headers and this leads to warnings like: warning:
'__used__' attribute ignored
__unused is not defined in the kernel and is not a standard definition.
If __unused is included everywhere instead of __used, this leads to
conflicts with glibc headers, since glibc has a variables with this name
in its headers.
The best approach is to use __maybe_unused, the definition used in the
kernel for __attribute__((unused)). In this way there is only one
definition in perf sources (instead of 2 definitions that point to the
same thing: __used and __unused) and it works on both Linux and Android.
This patch simply replaces all instances of __used and __unused with
__maybe_unused.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1347315303-29906-7-git-send-email-irina.tirdea@intel.com
[ committer note: fixed up conflict with a116e05 in builtin-sched.c ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
49 lines
1.2 KiB
C
49 lines
1.2 KiB
C
/* For debugging general purposes */
|
|
#ifndef __PERF_DEBUG_H
|
|
#define __PERF_DEBUG_H
|
|
|
|
#include <stdbool.h>
|
|
#include "event.h"
|
|
#include "../ui/helpline.h"
|
|
|
|
extern int verbose;
|
|
extern bool quiet, dump_trace;
|
|
|
|
int dump_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
|
|
void trace_event(union perf_event *event);
|
|
|
|
struct ui_progress;
|
|
struct perf_error_ops;
|
|
|
|
#if defined(NO_NEWT_SUPPORT) && defined(NO_GTK2_SUPPORT)
|
|
static inline void ui_progress__update(u64 curr __maybe_unused,
|
|
u64 total __maybe_unused,
|
|
const char *title __maybe_unused) {}
|
|
|
|
#define ui__error(format, arg...) ui__warning(format, ##arg)
|
|
|
|
static inline int
|
|
perf_error__register(struct perf_error_ops *eops __maybe_unused)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
perf_error__unregister(struct perf_error_ops *eops __maybe_unused)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#else /* NO_NEWT_SUPPORT && NO_GTK2_SUPPORT */
|
|
|
|
#include "../ui/progress.h"
|
|
int ui__error(const char *format, ...) __attribute__((format(printf, 1, 2)));
|
|
#include "../ui/util.h"
|
|
|
|
#endif /* NO_NEWT_SUPPORT && NO_GTK2_SUPPORT */
|
|
|
|
int ui__warning(const char *format, ...) __attribute__((format(printf, 1, 2)));
|
|
int ui__error_paranoid(void);
|
|
|
|
#endif /* __PERF_DEBUG_H */
|