Do not include xlat/clocknames.h twice

Make clocknames a global xlat array defined in time.c file.

* defs.h (clocknames): New prototype.
* perf.c: Stop including "xlat/clocknames.h".

diff --git a/defs.h b/defs.h
index b2be75b9e1de0be8a4f822f496c0c3a65ede9218..4c435da3648b45badf0c64675b91b3679eca8288 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -293,6 +293,7 @@ struct tcb {
 
 extern const struct xlat addrfams[];
 extern const struct xlat at_flags[];
+extern const struct xlat clocknames[];
 extern const struct xlat dirent_types[];
 extern const struct xlat evdev_abs[];
 extern const struct xlat msg_flags[];

diff --git a/perf.c b/perf.c
index d24cde3b0d1286239c90491bc8f50cb14ae6729d..71a308328b34804ee1e544490a7eea36c4ad9ca7 100644 (file)
--- a/perf.c
+++ b/perf.c
@@ -31,7 +31,6 @@
 
 #include "perf_event_struct.h"
 
-#include "xlat/clocknames.h"
 #include "xlat/hw_breakpoint_len.h"
 #include "xlat/hw_breakpoint_type.h"
 #include "xlat/perf_attr_size.h"