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 /nptl/descr.h | |
| parent | 1f655beb087a4ade30a0299d6f92b9916fbf7cc7 (diff) | |
| download | glibc-500b3a499fff61157db464a99f459c772d7eb6c0.tar glibc-500b3a499fff61157db464a99f459c772d7eb6c0.tar.gz glibc-500b3a499fff61157db464a99f459c772d7eb6c0.tar.bz2 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 'nptl/descr.h')
| -rw-r--r-- | nptl/descr.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nptl/descr.h b/nptl/descr.h index a145860f07..c5ad0c8dba 100644 --- a/nptl/descr.h +++ b/nptl/descr.h @@ -25,16 +25,14 @@ #include <stdbool.h> #include <sys/types.h> #include <hp-timing.h> -#define __need_list_t -#include <list.h> +#include <list_t.h> #include <lowlevellock.h> #include <pthreaddef.h> #include <dl-sysdep.h> #include "../nptl_db/thread_db.h" #include <tls.h> #include <unwind.h> -#define __need_res_state -#include <resolv.h> +#include <bits/types/res_state.h> #include <kernel-features.h> #ifndef TCB_ALIGNMENT |