[Intel-gfx] [PATCH i-g-t] lib: move igt_interactive_debug into igt_core.c

Thomas Wood thomas.wood at intel.com
Thu Mar 12 09:07:06 PDT 2015


igt_interactive_debug should be defined in igt_core.c, rather than the
header, to avoid it being defined more than once.

Reported-by: Damien Lespiau <damien.lespiau at intel.com>
Signed-off-by: Thomas Wood <thomas.wood at intel.com>
---
 lib/igt_core.c | 1 +
 lib/igt_core.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/igt_core.c b/lib/igt_core.c
index c217a01..4ae3524 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -209,6 +209,7 @@
  */
 
 static unsigned int exit_handler_count;
+const char *igt_interactive_debug;
 
 /* subtests helpers */
 static bool list_subtests = false;
diff --git a/lib/igt_core.h b/lib/igt_core.h
index c2c820d..0716000 100644
--- a/lib/igt_core.h
+++ b/lib/igt_core.h
@@ -557,7 +557,7 @@ bool igt_run_in_simulation(void);
 
 void igt_skip_on_simulation(void);
 
-const char *igt_interactive_debug;
+extern const char *igt_interactive_debug;
 
 /* structured logging */
 enum igt_log_level {
-- 
2.1.0



More information about the Intel-gfx mailing list