From e7c0dc24ea997ace937eaa3df7fb20b01eb95d14 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 27 Feb 2012 15:14:04 +0000 Subject: [PATCH] ARM: fix pthread_attr_t definitions. --- ChangeLog.arm | 6 ++++++ sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog.arm b/ChangeLog.arm index 7d23c11..982699c 100644 --- a/ChangeLog.arm +++ b/ChangeLog.arm @@ -1,3 +1,9 @@ +2012-02-27 Joseph Myers + + * sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h + (pthread_attr_t): Change union tag to pthread_attr_t. Only define + typedef if not already defined. + 2012-02-26 Joseph Myers * sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h: Name diff --git a/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h index c75a506..bb186ae 100644 --- a/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h +++ b/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h @@ -38,11 +38,15 @@ typedef unsigned long int pthread_t; -typedef union __pthread_attr +union pthread_attr_t { char __size[__SIZEOF_PTHREAD_ATTR_T]; long int __align; -} pthread_attr_t; +}; +#ifndef __have_pthread_attr_t +typedef union pthread_attr_t pthread_attr_t; +# define __have_pthread_attr_t 1 +#endif typedef struct __pthread_internal_slist -- 2.7.4