From: Julian Seward <jseward@acm.org>
Date: Sat, 4 May 2002 10:28:17 +0000 (+0000)
Subject: glibc 2.1.3 compile fixes (Lionel Ulmer).
X-Git-Tag: svn/VALGRIND_1_0_3~243
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a472d679d912856dba62e30ab5335baa9be50045;p=thirdparty%2Fvalgrind.git

glibc 2.1.3 compile fixes (Lionel Ulmer).


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

diff --git a/vg_syscall_mem.c b/vg_syscall_mem.c
index abcc63e830..3ef4904c55 100644
--- a/vg_syscall_mem.c
+++ b/vg_syscall_mem.c
@@ -300,7 +300,7 @@ void must_be_readable_sockaddr ( ThreadState* tst,
          VG_(sprintf) ( outmsg, description, ".sin_port" );
          must_be_readable( tst, outmsg,
             (UInt) &((struct sockaddr_in *) sa)->sin_port,
-            sizeof (in_port_t));
+            sizeof (((struct sockaddr_in *) sa)->sin_port));
          VG_(sprintf) ( outmsg, description, ".sin_addr" );
          must_be_readable( tst, outmsg,
             (UInt) &((struct sockaddr_in *) sa)->sin_addr,
@@ -311,7 +311,7 @@ void must_be_readable_sockaddr ( ThreadState* tst,
          VG_(sprintf) ( outmsg, description, ".sin6_port" );
          must_be_readable( tst, outmsg,
             (UInt) &((struct sockaddr_in6 *) sa)->sin6_port,
-            sizeof (in_port_t));
+            sizeof (((struct sockaddr_in6 *) sa)->sin6_port));
          VG_(sprintf) ( outmsg, description, ".sin6_flowinfo" );
          must_be_readable( tst, outmsg,
             (UInt) &((struct sockaddr_in6 *) sa)->sin6_flowinfo,
@@ -320,10 +320,12 @@ void must_be_readable_sockaddr ( ThreadState* tst,
          must_be_readable( tst, outmsg,
             (UInt) &((struct sockaddr_in6 *) sa)->sin6_addr,
             sizeof (struct in6_addr));
+#        ifndef GLIBC_2_1
          VG_(sprintf) ( outmsg, description, ".sin6_scope_id" );
          must_be_readable( tst, outmsg,
             (UInt) &((struct sockaddr_in6 *) sa)->sin6_scope_id,
             sizeof (uint32_t));
+#        endif
          break;
                
       default: