diff options
| author | Petri Latvala <petri.latvala@intel.com> | 2018-06-21 14:06:24 +0300 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-06-25 09:32:08 +0300 |
| commit | 9bbfbb1ce314578f18efe73b2cd74e877eb999fb (patch) | |
| tree | 5bb730fa32519259a4540721dbcd969eff88e7dc /lib/igt_core.c | |
| parent | 23d50a49413aff619d00ec50fc2e051e9b45baa5 (diff) | |
Make GLib mandatory
GLib was originally made optional for Android builds, and Android
support was dropped a while ago due to lack of use and maintenance.
Building without GLib was broken without bug reports anyway.
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib/igt_core.c')
| -rw-r--r-- | lib/igt_core.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/igt_core.c b/lib/igt_core.c index 06d8b037..3313050c 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -55,9 +55,7 @@ #include <limits.h> #include <locale.h> #include <uwildmat/uwildmat.h> -#ifdef HAVE_GLIB #include <glib.h> -#endif #include "drmtest.h" #include "intel_chipset.h" @@ -299,9 +297,7 @@ static struct { } log_buffer; static pthread_mutex_t log_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; -#ifdef HAVE_GLIB GKeyFile *igt_key_file; -#endif char *igt_frame_dump_path; @@ -573,7 +569,6 @@ static void oom_adjust_for_doom(void) } -#ifdef HAVE_GLIB static void common_init_config(void) { char *key_file_env = NULL; @@ -624,7 +619,6 @@ out: if (!key_file_env && key_file_loc) free(key_file_loc); } -#endif static void common_init_env(void) { @@ -778,9 +772,7 @@ static int common_init(int *argc, char **argv, } } -#ifdef HAVE_GLIB common_init_config(); -#endif out: free(short_opts); @@ -1435,10 +1427,8 @@ void igt_exit(void) { igt_exit_called = true; -#ifdef HAVE_GLIB if (igt_key_file) g_key_file_free(igt_key_file); -#endif if (run_single_subtest && !run_single_subtest_found) { igt_warn("Unknown subtest: %s\n", run_single_subtest); |