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.c | |
| 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.c')
| -rw-r--r-- | lib/igt_core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/igt_core.c b/lib/igt_core.c index 47b4682d..950ea9b0 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -55,7 +55,9 @@ #include <limits.h> #include <locale.h> #include <uwildmat/uwildmat.h> +#ifdef HAVE_GLIB #include <glib.h> +#endif #include "drmtest.h" #include "intel_chipset.h" @@ -67,6 +69,7 @@ #include "igt_core.h" #include "igt_aux.h" #include "igt_sysfs.h" +#include "igt_rc.h" #ifdef HAVE_LIBGEN_H #include <libgen.h> /* for basename() on Solaris */ |