From: Julian Seward <jseward@acm.org>
Date: Fri, 20 Jun 2014 14:07:38 +0000 (+0000)
Subject: Fix a -Wshadow warning from some oldish version of XCode.
X-Git-Tag: svn/VALGRIND_3_10_0~374
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e9c5b87dda2edce4df43af37fdd79976984b562;p=thirdparty%2Fvalgrind.git

Fix a -Wshadow warning from some oldish version of XCode.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14063
---

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index f1207f47f3..370e9baaa3 100644
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -927,7 +927,7 @@ void msghdr_foreachfield (
         struct vki_msghdr *msg,
         UInt length,
         void (*foreach_func)( ThreadId, Bool, const HChar *, Addr, SizeT ),
-        Bool recv
+        Bool rekv /* "recv" apparently shadows some header decl on OSX108 */
      )
 {
    HChar *fieldName;
@@ -948,7 +948,7 @@ void msghdr_foreachfield (
 
    /* msg_flags is completely ignored for send_mesg, recv_mesg doesn't read
       the field, but does write to it. */
-   if ( recv )
+   if ( rekv )
       foreach_func ( tid, False, fieldName, (Addr)&msg->msg_flags, sizeof( msg->msg_flags ) );
 
    if ( ML_(safe_to_deref)(&msg->msg_name, sizeof (void *))