summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Wood <thomas.wood@intel.com>2015-03-12 14:59:20 +0000
committerThomas Wood <thomas.wood@intel.com>2015-03-12 15:11:11 +0000
commita6c40c7665287305fe838b6871a26bcfecad9c0a (patch)
tree1d604e813a3e0973b0bf6eac516d8daf4a45295f
parentdde047fe2c84e2519a8ed24db4ac9c794285bbd1 (diff)
lib: move igt_interactive_debug into igt_core.c
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@intel.com> Signed-off-by: Thomas Wood <thomas.wood@intel.com>
-rw-r--r--lib/igt_core.c1
-rw-r--r--lib/igt_core.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/igt_core.c b/lib/igt_core.c
index c217a016..4ae35240 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 c2c820d1..07160009 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 {