From 2ea97941102380c28117882600265c1187c6fc8b Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Mon, 14 Dec 2009 19:53:05 +0000
Subject: 	Revert -Wshadow changes, all changes from: 	2009-12-11 
 Doug Kwan  <dougkwan@google.com> 	2009-12-11  Nick Clifton 
 <nickc@redhat.com> 	* configure.ac: Remove -Wshadow when setting
 WARN_CXXFLAGS.

---
 gold/testsuite/tls_test_main.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gold/testsuite')

diff --git a/gold/testsuite/tls_test_main.cc b/gold/testsuite/tls_test_main.cc
index 877889c..0ff02c6 100644
--- a/gold/testsuite/tls_test_main.cc
+++ b/gold/testsuite/tls_test_main.cc
@@ -33,16 +33,16 @@
 #define safe_lock(muptr)			\
   do						\
     {						\
-      int pthread_err = pthread_mutex_lock(muptr);	\
-      assert(pthread_err == 0);				\
+      int err = pthread_mutex_lock(muptr);	\
+      assert(err == 0);				\
     }						\
   while (0)
 
 #define safe_unlock(muptr)			\
   do						\
     {						\
-      int pthread_err = pthread_mutex_unlock(muptr);	\
-      assert(pthread_err == 0);				\
+      int err = pthread_mutex_unlock(muptr);	\
+      assert(err == 0);				\
     }						\
   while (0)
 
-- 
cgit v1.1