From 21a497cc58df2b9b02dc687b97f105335e7a1c50 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 19 Jul 2021 07:55:27 +0200 Subject: resolv: Move res_mkquery, res_nmkquery into libc This switches to public symbols without __ prefixes, due to improved namespace management in glibc. The symbols res_mkquery, __res_mkquery, __res_nmkquery were moved with the script (using --no-new-version). res_mkquery@@GLIBC_2.34, res_nmkquery@@GLIBC_2.34 were added using make update-all-abi. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- resolv/resolv-internal.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'resolv/resolv-internal.h') diff --git a/resolv/resolv-internal.h b/resolv/resolv-internal.h index 1e21c38..3cf8a77 100644 --- a/resolv/resolv-internal.h +++ b/resolv/resolv-internal.h @@ -55,7 +55,8 @@ struct resolv_context; Also used by __res_context_query. */ int __res_context_mkquery (struct resolv_context *, int op, const char *dname, int class, int type, const unsigned char *data, - unsigned char *buf, int buflen) attribute_hidden; + unsigned char *buf, int buflen); +libc_hidden_proto (__res_context_mkquery) /* Main resolver query function for use within glibc. */ int __res_context_search (struct resolv_context *, const char *, int, int, @@ -84,7 +85,8 @@ libc_hidden_proto (__res_context_hostalias); /* Add an OPT record to a DNS query. */ int __res_nopt (struct resolv_context *, int n0, - unsigned char *buf, int buflen, int anslen) attribute_hidden; + unsigned char *buf, int buflen, int anslen); +libc_hidden_proto (__res_nopt) /* Convert from presentation format (which usually means ASCII printable) to network format (which is usually some kind of binary -- cgit v1.1