This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.21-233-g675ddb7
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 28 Mar 2015 05:50:26 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-233-g675ddb7
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 "GNU C Library master sources".
The branch, master has been updated
via 675ddb7184f642263331b13ac7bf726536504f97 (commit)
from 4d611e1261961bb9460faf21418845918ad270fd (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=675ddb7184f642263331b13ac7bf726536504f97
commit 675ddb7184f642263331b13ac7bf726536504f97
Author: Martin Galvan <martin.galvan@tallertechnologies.com>
Date: Sat Mar 28 01:41:35 2015 -0300
NPTL: Remove duplicate definition of PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
The PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP macro was defined twice with the
same values in pthread.h; this removes the second definition.
diff --git a/ChangeLog b/ChangeLog
index 70a4657..d08a60a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-28 Martin Galvan <martin.galvan@tallertechnologies.com>
+
+ * sysdeps/nptl/pthread.h: Remove duplicate definition of
+ PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP.
+
2015-03-27 Martin Galvan <martin.galvan@tallertechnologies.com>
* sysdeps/i386/nptl/tls.h: Swap comments between THREAD_SETMEM and
diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h
index 70ff250..89d0882 100644
--- a/sysdeps/nptl/pthread.h
+++ b/sysdeps/nptl/pthread.h
@@ -92,8 +92,6 @@ enum
{ { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, __PTHREAD_SPINS, { 0, 0 } } }
# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
{ { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __PTHREAD_SPINS, { 0, 0 } } }
-# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
- { { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __PTHREAD_SPINS, { 0, 0 } } }
# endif
#else
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/nptl/pthread.h | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources