This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Community source repository for glibc add-on ports branch, master, updated. glibc-2.15-94-g175763a


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Community source repository for glibc add-on ports".

The branch, master has been updated
       via  175763ab6860299accaf5270470e7f35fb8d7c96 (commit)
      from  bf8becc54bb3a666872148110d8e2d33388d4c40 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc-ports.git;a=commitdiff;h=175763ab6860299accaf5270470e7f35fb8d7c96

commit 175763ab6860299accaf5270470e7f35fb8d7c96
Author: Andreas Schwab <schwab@linux-m68k.org>
Date:   Mon Feb 27 21:15:54 2012 +0100

    m68k: only define pthread_attr_t if not already defined

diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index c84aad6..1d3e77b 100644
--- 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
--- 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

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog.m68k                                     |    3 ++-
 .../unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h  |    8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Community source repository for glibc add-on ports


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]