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 4fd4e50ad11f92d618b3898e0590b94eaba9adbc..84724e1fe3bdafd8959dc7a73c37cddedc350469 100644 (file)
--- 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 );
 }