 1d037ca164
			
		
	
	
	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>
		
	
			
		
			
				
	
	
		
			21 lines
		
	
	
	
		
			456 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			21 lines
		
	
	
	
		
			456 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "gtk.h"
 | |
| #include "../../util/cache.h"
 | |
| #include "../../util/debug.h"
 | |
| 
 | |
| extern struct perf_error_ops perf_gtk_eops;
 | |
| 
 | |
| int perf_gtk__init(void)
 | |
| {
 | |
| 	perf_error__register(&perf_gtk_eops);
 | |
| 	perf_gtk__init_helpline();
 | |
| 	perf_gtk__init_hpp();
 | |
| 	return gtk_init_check(NULL, NULL) ? 0 : -1;
 | |
| }
 | |
| 
 | |
| void perf_gtk__exit(bool wait_for_ok __maybe_unused)
 | |
| {
 | |
| 	if (!perf_gtk__is_active_context(pgctx))
 | |
| 		return;
 | |
| 	perf_error__unregister(&perf_gtk_eops);
 | |
| 	gtk_main_quit();
 | |
| }
 |