From 3931478319b31d4d28940076ec39475bb4d1018d Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 19 Mar 2018 02:35:05 +0100 Subject: Move bits/thread-specific.h to bits/types/__pthread_key.h * sysdeps/pthread/bits/thread-specific.h: Move file to... * sysdeps/pthread/bits/types/__pthread_key.h: ... here. * Makefile (headers): Update accordingly. * sysdeps/generic/pthread.h: Likewise. * sysdeps/pthread/bits/pthreadtypes.h: Likewise. --- sysdeps/pthread/bits/pthreadtypes.h | 2 +- sysdeps/pthread/bits/thread-specific.h | 24 ------------------------ sysdeps/pthread/bits/types/__pthread_key.h | 24 ++++++++++++++++++++++++ 3 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 sysdeps/pthread/bits/thread-specific.h create mode 100644 sysdeps/pthread/bits/types/__pthread_key.h (limited to 'sysdeps/pthread') diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index fc5bc5b..3e42f50 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -122,7 +122,7 @@ typedef struct __pthread_barrier pthread_barrier_t; #endif /* __USE_XOPEN2K */ -#include +#include typedef __pthread_key pthread_key_t; #include diff --git a/sysdeps/pthread/bits/thread-specific.h b/sysdeps/pthread/bits/thread-specific.h deleted file mode 100644 index f0435f6..0000000 --- a/sysdeps/pthread/bits/thread-specific.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Thread specific data. Generic version. - Copyright (C) 2002-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If - not, see . */ - -#ifndef _BITS_THREAD_SPECIFIC_H -#define _BITS_THREAD_SPECIFIC_H 1 - -typedef int __pthread_key; - -#endif /* bits/thread-specific.h */ diff --git a/sysdeps/pthread/bits/types/__pthread_key.h b/sysdeps/pthread/bits/types/__pthread_key.h new file mode 100644 index 0000000..c558f47 --- /dev/null +++ b/sysdeps/pthread/bits/types/__pthread_key.h @@ -0,0 +1,24 @@ +/* Thread specific data. Generic version. + Copyright (C) 2002-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If + not, see . */ + +#ifndef _BITS_TYPES___PTHREAD_KEY_H +#define _BITS_TYPES___PTHREAD_KEY_H 1 + +typedef int __pthread_key; + +#endif /* bits/types/__pthread_key.h */ -- cgit v1.2.3