forked from Minki/linux
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>
48 lines
1.1 KiB
C
48 lines
1.1 KiB
C
#ifndef _PERF_UI_HELPLINE_H_
|
|
#define _PERF_UI_HELPLINE_H_ 1
|
|
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
|
|
#include "../util/cache.h"
|
|
|
|
struct ui_helpline {
|
|
void (*pop)(void);
|
|
void (*push)(const char *msg);
|
|
};
|
|
|
|
extern struct ui_helpline *helpline_fns;
|
|
|
|
void ui_helpline__init(void);
|
|
|
|
void ui_helpline__pop(void);
|
|
void ui_helpline__push(const char *msg);
|
|
void ui_helpline__vpush(const char *fmt, va_list ap);
|
|
void ui_helpline__fpush(const char *fmt, ...);
|
|
void ui_helpline__puts(const char *msg);
|
|
|
|
extern char ui_helpline__current[512];
|
|
|
|
#ifdef NO_NEWT_SUPPORT
|
|
static inline int ui_helpline__show_help(const char *format __maybe_unused,
|
|
va_list ap __maybe_unused)
|
|
{
|
|
return 0;
|
|
}
|
|
#else
|
|
extern char ui_helpline__last_msg[];
|
|
int ui_helpline__show_help(const char *format, va_list ap);
|
|
#endif /* NO_NEWT_SUPPORT */
|
|
|
|
#ifdef NO_GTK2_SUPPORT
|
|
static inline int perf_gtk__show_helpline(const char *format __maybe_unused,
|
|
va_list ap __maybe_unused)
|
|
{
|
|
return 0;
|
|
}
|
|
#else
|
|
int perf_gtk__show_helpline(const char *format, va_list ap);
|
|
#endif /* NO_GTK2_SUPPORT */
|
|
|
|
#endif /* _PERF_UI_HELPLINE_H_ */
|