From 640bbdf71c6f10ac26252ac67a22902e26657bd8 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 19 Jul 2021 07:55:27 +0200 Subject: resolv: Move dn_expand to its own file and into libc And reformat to GNU style. This switches back to the dn_expand name for the ABI symbol and turns __dn_expand into a compatibility symbol. With the improved namespace management in current glibc, it is no longer necessary to use a private namespace symbol. To avoid old code binding to a GLIBC_PRIVATE symbol by accident, use __libc_dn_expand for the internal symbol name. The symbols dn_expand, __dnexpand were moved using scripts/move-symbol-to-libc.py, followed by an adjustment to make dn_expand the only GLIBC_2.34 symbol. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- include/resolv.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/resolv.h b/include/resolv.h index daf4a74..44fc0c3 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -44,7 +44,6 @@ libresolv_hidden_proto (_sethtent) libresolv_hidden_proto (_gethtent) libresolv_hidden_proto (_gethtbyaddr) libresolv_hidden_proto (_gethtbyname2) -libresolv_hidden_proto (__dn_expand) libresolv_hidden_proto (__dn_comp) libresolv_hidden_proto (__dn_skipname) libresolv_hidden_proto (__res_hnok) @@ -66,5 +65,8 @@ libresolv_hidden_proto (__res_queriesmatch) libresolv_hidden_proto (__b64_ntop) libresolv_hidden_proto (__dn_count_labels) +extern __typeof (dn_expand) __libc_dn_expand; +libc_hidden_proto (__libc_dn_expand) + # endif /* _RESOLV_H_ && !_ISOMAC */ #endif -- cgit v1.1