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 + include/list.h | 38 ++++++++++---------------------------- include/list_t.h | 31 +++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 28 deletions(-) create mode 100644 include/bits/types/res_state.h create mode 100644 include/list_t.h (limited to 'include') diff --git a/include/bits/types/res_state.h b/include/bits/types/res_state.h new file mode 100644 index 0000000..4b99b68 --- /dev/null +++ b/include/bits/types/res_state.h @@ -0,0 +1 @@ +#include diff --git a/include/list.h b/include/list.h index 6846783..dec5dee 100644 --- a/include/list.h +++ b/include/list.h @@ -17,39 +17,23 @@ . */ #ifndef _LIST_H +#define _LIST_H 1 -#ifndef __need_list_t -# define _LIST_H 1 -#endif +/* Internal: doubly linked lists. */ /* The definitions of this file are adopted from those which can be found in the Linux kernel headers to enable people familiar with the latter find their way in these sources as well. */ - -#if defined __need_list_t || defined _LIST_H -# ifndef __list_t_defined -# define __list_t_defined -/* Basic type for the double-link list. */ -typedef struct list_head -{ - struct list_head *next; - struct list_head *prev; -} list_t; -# endif -# undef __need_list_t -#endif - -#ifdef _LIST_H - -# include +#include +#include /* Define a variable with the head and tail of the list. */ -# define LIST_HEAD(name) \ +#define LIST_HEAD(name) \ list_t name = { &(name), &(name) } /* Initialize a new list head. */ -# define INIT_LIST_HEAD(ptr) \ +#define INIT_LIST_HEAD(ptr) \ (ptr)->next = (ptr)->prev = (ptr) @@ -90,28 +74,26 @@ list_splice (list_t *add, list_t *head) /* Get typed element from list at a given position. */ -# define list_entry(ptr, type, member) \ +#define list_entry(ptr, type, member) \ ((type *) ((char *) (ptr) - (unsigned long) (&((type *) 0)->member))) /* Iterate forward over the elements of the list. */ -# define list_for_each(pos, head) \ +#define list_for_each(pos, head) \ for (pos = (head)->next; pos != (head); pos = pos->next) /* Iterate forward over the elements of the list. */ -# define list_for_each_prev(pos, head) \ +#define list_for_each_prev(pos, head) \ for (pos = (head)->prev; pos != (head); pos = pos->prev) /* Iterate backwards over the elements list. The list elements can be removed from the list while doing this. */ -# define list_for_each_prev_safe(pos, p, head) \ +#define list_for_each_prev_safe(pos, p, head) \ for (pos = (head)->prev, p = pos->prev; \ pos != (head); \ pos = p, p = pos->prev) -#endif /* _LIST_H */ - #endif /* list.h */ diff --git a/include/list_t.h b/include/list_t.h new file mode 100644 index 0000000..d737e2e --- /dev/null +++ b/include/list_t.h @@ -0,0 +1,31 @@ +/* Copyright (C) 2002-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2002. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _LIST_T_H +#define _LIST_T_H 1 + +/* Internal: doubly linked lists. */ + +/* Basic type for the double-link list. */ +typedef struct list_head +{ + struct list_head *next; + struct list_head *prev; +} list_t; + +#endif /* list_t.h */ -- cgit v1.1