diff options
author | Petri Latvala <petri.latvala@intel.com> | 2017-09-29 13:51:59 +0300 |
---|---|---|
committer | Petri Latvala <petri.latvala@intel.com> | 2017-10-03 12:55:32 +0300 |
commit | 08a2f887b26c89cfb1e1b5715a23d561b75e0dab (patch) | |
tree | 43baf8d21ed67b8fa69d848a0eff15fb2fde504b /lib/igt_core.h | |
parent | 0c7e50650d0c9fa1e04b1140e065ae2cf800bd1f (diff) |
lib: Reduce dependency on glib
In commit ebd6eb69f57b ("Make igtrc configuration common, with
configurable suspend/resume delay") .igtrc handling was moved to
igt_core from igt_chamelium. That made everything in IGT depend on
GLIB by accident.
In short, igt_core.h declared a variable of type GKeyFile*, requiring
glib.h. Everything that tried to #include igt_core.h required glib.h
to be available, by use of GLIB_CFLAGS. This "worked" so far because
CAIRO_CFLAGS contained GLIB_CFLAGS.
As the variable is only used by other stuff in lib/, stuff it in its
own header file to leave igt_core.h without a dependency to glib.h.
Also add a couple of missing #ifdef HAVE_GLIBs around.
Reported-by: Felipe De Jesus Ruiz Garcia <felipe.de.jesus.ruiz.garcia@intel.com>
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Diffstat (limited to 'lib/igt_core.h')
-rw-r--r-- | lib/igt_core.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/igt_core.h b/lib/igt_core.h index c90ae2de..f8543d65 100644 --- a/lib/igt_core.h +++ b/lib/igt_core.h @@ -40,7 +40,6 @@ #include <stdarg.h> #include <getopt.h> #include <unistd.h> -#include <glib.h> #ifndef IGT_LOG_DOMAIN #define IGT_LOG_DOMAIN (NULL) @@ -49,7 +48,6 @@ extern const char* __igt_test_description __attribute__((weak)); extern bool __igt_plain_output; -extern GKeyFile *igt_key_file; extern char *igt_frame_dump_path; /** |