diff options
| author | Zack Weinberg <zackw@panix.com> | 2017-03-22 09:55:25 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2017-05-20 19:01:46 -0400 |
| commit | 500b3a499fff61157db464a99f459c772d7eb6c0 (patch) | |
| tree | e083962624bc0aeeacb478c310a2d759365d22df /resolv/Makefile | |
| parent | 1f655beb087a4ade30a0299d6f92b9916fbf7cc7 (diff) | |
| download | glibc-500b3a499fff61157db464a99f459c772d7eb6c0.tar.gz glibc-500b3a499fff61157db464a99f459c772d7eb6c0.tar.xz glibc-500b3a499fff61157db464a99f459c772d7eb6c0.zip | |
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.
Diffstat (limited to 'resolv/Makefile')
| -rw-r--r-- | resolv/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resolv/Makefile b/resolv/Makefile index d41fd4603d..70b6f4ffe8 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -22,7 +22,7 @@ subdir := resolv include ../Makeconfig -headers := resolv.h \ +headers := resolv.h bits/types/res_state.h \ netdb.h bits/netdb.h \ arpa/nameser.h arpa/nameser_compat.h \ sys/bitypes.h |