From 64e55cccfcffd5a47a0dd92a910eefd477809b18 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 19 Mar 2018 02:21:01 +0100 Subject: Move bits/condition.h to bits/types/struct___pthread_cond.h * sysdeps/pthread/bits/condition.h: Move file to... * sysdeps/pthread/bits/types/struct___pthread_cond.h: ... here. * Makefile (headers): Update accordingly. * sysdeps/generic/pthread.h: Likewise. * sysdeps/pthread/bits/pthreadtypes.h: Likewise. --- sysdeps/pthread/bits/condition.h | 38 ---------------------- sysdeps/pthread/bits/pthreadtypes.h | 2 +- sysdeps/pthread/bits/types/struct___pthread_cond.h | 38 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 sysdeps/pthread/bits/condition.h create mode 100644 sysdeps/pthread/bits/types/struct___pthread_cond.h (limited to 'sysdeps/pthread/bits') diff --git a/sysdeps/pthread/bits/condition.h b/sysdeps/pthread/bits/condition.h deleted file mode 100644 index 75942e2..0000000 --- a/sysdeps/pthread/bits/condition.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Condition type. Generic version. - Copyright (C) 2000-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_CONDITION_H -#define _BITS_CONDITION_H 1 - -#include - -/* User visible part of a condition variable. */ -struct __pthread_cond - { - __pthread_spinlock_t __lock; - struct __pthread *__queue; - struct __pthread_condattr *__attr; - struct __pthread_condimpl *__impl; - void *__data; - }; - -/* Initializer for a condition variable. */ -#define __PTHREAD_COND_INITIALIZER \ - { __PTHREAD_SPIN_LOCK_INITIALIZER, NULL, NULL, NULL, NULL } - -#endif /* bits/condition.h */ diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index f874219..59ab32a 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -94,7 +94,7 @@ typedef struct __pthread_mutex pthread_mutex_t; #include typedef struct __pthread_condattr pthread_condattr_t; -#include +#include typedef struct __pthread_cond pthread_cond_t; #ifdef __USE_XOPEN2K diff --git a/sysdeps/pthread/bits/types/struct___pthread_cond.h b/sysdeps/pthread/bits/types/struct___pthread_cond.h new file mode 100644 index 0000000..11c685e --- /dev/null +++ b/sysdeps/pthread/bits/types/struct___pthread_cond.h @@ -0,0 +1,38 @@ +/* Condition type. Generic version. + Copyright (C) 2000-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_STRUCT___PTHREAD_COND_H +#define _BITS_TYPES_STRUCT___PTHREAD_COND_H 1 + +#include + +/* User visible part of a condition variable. */ +struct __pthread_cond + { + __pthread_spinlock_t __lock; + struct __pthread *__queue; + struct __pthread_condattr *__attr; + struct __pthread_condimpl *__impl; + void *__data; + }; + +/* Initializer for a condition variable. */ +#define __PTHREAD_COND_INITIALIZER \ + { __PTHREAD_SPIN_LOCK_INITIALIZER, NULL, NULL, NULL, NULL } + +#endif /* bits/types/struct___pthread_cond.h */ -- cgit v1.2.3