From 500b3a499fff61157db464a99f459c772d7eb6c0 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Wed, 22 Mar 2017 09:55:25 -0400 Subject: Remove __need_list_t and __need_res_state. These __need macros are only used internally, by nptl/descr.h. However, including all of resolv.h from descr.h causes build failures due to resolv.h's dozens of pseudo-struct-field macros, some of which collide with struct fields in NPTL internal data structures. Similarly, including all of list.h from descr.h produces an include cycle, atomic.h -> atomic-machine.h -> tls.h -> descr.h -> list.h -> atomic.h, and then list.h tries to use atomic.h macros that haven't been defined yet. So we do need mini-headers for these. In the list.h case I called it include/list_t.h since it isn't going to be installed. * resolv/resolv.h: Remove __need_res_state logic. Move definition of res_state and related constants to ... * resolv/bits/types/res_state.h: ...this new file. * resolv/Makefile: Install bits/types/res_state.h. * include/bits/types/res_state.h: New wrapper. * include/list.h: Remove __need_list_t logic. Move definition of list_t to ... * include/list_t.h: ...this new file. * nptl/descr.h: Include list_t.h and bits/types/res_state.h instead of list.h and resolv.h. --- include/bits/types/res_state.h | 1 + 1 file changed, 1 insertion(+) create mode 100644 include/bits/types/res_state.h (limited to 'include/bits') diff --git a/include/bits/types/res_state.h b/include/bits/types/res_state.h new file mode 100644 index 0000000000..4b99b68da9 --- /dev/null +++ b/include/bits/types/res_state.h @@ -0,0 +1 @@ +#include -- cgit v1.2.3