From 372a613dbe4a85779807040300985fc5289b9fd7 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 19 Mar 2018 02:27:29 +0100 Subject: Move bits/once.h to bits/types/struct___pthread_once.h * sysdeps/pthread/bits/once.h: Move file to... * sysdeps/pthread/bits/types/struct___pthread_once.h: ... here. * Makefile (headers): Update accordingly. * sysdeps/generic/pthread.h: Likewise. * sysdeps/pthread/bits/pthreadtypes.h: Likewise. --- sysdeps/pthread/bits/once.h | 33 ---------------------- sysdeps/pthread/bits/pthreadtypes.h | 2 +- sysdeps/pthread/bits/types/struct___pthread_once.h | 33 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 sysdeps/pthread/bits/once.h create mode 100644 sysdeps/pthread/bits/types/struct___pthread_once.h (limited to 'sysdeps/pthread/bits') diff --git a/sysdeps/pthread/bits/once.h b/sysdeps/pthread/bits/once.h deleted file mode 100644 index 610a269..0000000 --- a/sysdeps/pthread/bits/once.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Dynamic package initialization data structures. 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_ONCE_H -#define _BITS_ONCE_H 1 - -#include - -struct __pthread_once -{ - int __run; - __pthread_spinlock_t __lock; -}; - -#define __PTHREAD_ONCE_INIT \ - (struct __pthread_once) { 0, __PTHREAD_SPIN_LOCK_INITIALIZER } - -#endif /* bits/once.h */ diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index eeb4269..55a5659 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -125,7 +125,7 @@ typedef struct __pthread_barrier pthread_barrier_t; #include typedef __pthread_key pthread_key_t; -#include +#include typedef struct __pthread_once pthread_once_t; __END_DECLS diff --git a/sysdeps/pthread/bits/types/struct___pthread_once.h b/sysdeps/pthread/bits/types/struct___pthread_once.h new file mode 100644 index 0000000..5b99658 --- /dev/null +++ b/sysdeps/pthread/bits/types/struct___pthread_once.h @@ -0,0 +1,33 @@ +/* Dynamic package initialization data structures. 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_STRUCT___PTHREAD_ONCE_H +#define _BITS_TYPES_STRUCT___PTHREAD_ONCE_H 1 + +#include + +struct __pthread_once +{ + int __run; + __pthread_spinlock_t __lock; +}; + +#define __PTHREAD_ONCE_INIT \ + (struct __pthread_once) { 0, __PTHREAD_SPIN_LOCK_INITIALIZER } + +#endif /* bits/types/struct___pthread_once.h */ -- cgit v1.2.3