Merge pull request #5810 from micmac1/glib2-res_nquery-fix
glib2: fix build when res_nquery is not available
This commit is contained in:
commit
6b2daa3bdb
|
@ -0,0 +1,20 @@
|
|||
--- a/gio/gthreadedresolver.c
|
||||
+++ b/gio/gthreadedresolver.c
|
||||
@@ -869,6 +869,8 @@ do_lookup_records (GTask *task,
|
||||
records = g_resolver_records_from_res_query (lrd->rrname, rrtype, answer->data, len, herr, &error);
|
||||
g_byte_array_free (answer, TRUE);
|
||||
|
||||
+#ifdef HAVE_RES_NQUERY
|
||||
+
|
||||
#if defined(HAVE_RES_NDESTROY)
|
||||
res_ndestroy (&res);
|
||||
#elif defined(HAVE_RES_NCLOSE)
|
||||
@@ -877,6 +879,8 @@ do_lookup_records (GTask *task,
|
||||
#error "Your platform has res_ninit() but not res_nclose() or res_ndestroy(). Please file a bug at https://bugzilla.gnome.org/enter_bug.cgi?product=glib"
|
||||
#endif
|
||||
|
||||
+#endif
|
||||
+
|
||||
#else
|
||||
|
||||
DNS_STATUS status;
|
Loading…
Reference in New Issue