m68k: only define pthread_attr_t if not already defined

diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index c84aad6..1d3e77b 100644 (file)
--- a/ChangeLog.m68k
+++ b/ChangeLog.m68k
@@ -1,7 +1,8 @@
 2012-02-27  Andreas Schwab  <schwab@linux-m68k.org>
 
        * 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  <schwab@linux-m68k.org>
 

diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
index fe6e2b5..588c928 100644 (file)
--- 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