From: Julian Seward <jseward@acm.org>
Date: Sun, 23 Nov 2014 12:21:33 +0000 (+0000)
Subject: Merge, from trunk, r14599
X-Git-Tag: svn/VALGRIND_3_10_1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d62886936c276693028664bf9938ca4431a3d49;p=thirdparty%2Fvalgrind.git

Merge, from trunk, r14599
339645  Use correct tag names in sys_getdents/64 wrappers



git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_10_BRANCH@14749
---

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 4fd4e50ad1..84724e1fe3 100644
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -3242,7 +3242,7 @@ PRE(sys_getdents)
    *flags |= SfMayBlock;
    PRINT("sys_getdents ( %ld, %#lx, %ld )", ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "getdents",
-                 unsigned int, fd, struct linux_dirent *, dirp,
+                 unsigned int, fd, struct vki_dirent *, dirp,
                  unsigned int, count);
    PRE_MEM_WRITE( "getdents(dirp)", ARG2, ARG3 );
 }
@@ -3259,7 +3259,7 @@ PRE(sys_getdents64)
    *flags |= SfMayBlock;
    PRINT("sys_getdents64 ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "getdents64",
-                 unsigned int, fd, struct linux_dirent64 *, dirp,
+                 unsigned int, fd, struct vki_dirent64 *, dirp,
                  unsigned int, count);
    PRE_MEM_WRITE( "getdents64(dirp)", ARG2, ARG3 );
 }