From 175763ab6860299accaf5270470e7f35fb8d7c96 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 27 Feb 2012 21:15:54 +0100 Subject: [PATCH] m68k: only define pthread_attr_t if not already defined --- ChangeLog.m68k | 3 ++- sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog.m68k b/ChangeLog.m68k index c84aad6115..1d3e77b324 100644 --- a/ChangeLog.m68k +++ b/ChangeLog.m68k @@ -1,7 +1,8 @@ 2012-02-27 Andreas Schwab * sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h - (pthread_attr_t): Fix name of union. + (pthread_attr_t): Fix name of union. Only define if not already + defined. 2012-02-26 Andreas Schwab diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h index fe6e2b576b..588c928f71 100644 --- a/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h +++ b/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h @@ -38,11 +38,15 @@ typedef unsigned long int pthread_t; -typedef union pthread_attr_t +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.43.5