From: Julian Seward Date: Wed, 25 Nov 2009 13:57:47 +0000 (+0000) Subject: Fix type in r10951. Not sure why this didn't cause a compilation X-Git-Tag: svn/VALGRIND_3_6_0~457 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a888ce7eba5e9a8027caf3a361b0f8c615b0092;p=thirdparty%2Fvalgrind.git Fix type in r10951. Not sure why this didn't cause a compilation error, but least on ppc32-linux it didn't. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10956 --- diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c index bd78cbd192..de7a3062cd 100644 --- a/coregrind/m_syswrap/syswrap-generic.c +++ b/coregrind/m_syswrap/syswrap-generic.c @@ -2355,7 +2355,7 @@ PRE(sys_pwrite64) ARG1, ARG2, (ULong)ARG3, MERGE64(ARG4,ARG5)); PRE_REG_READ5(ssize_t, "pwrite64", unsigned int, fd, const char *, buf, vki_size_t, count, - vki_u32, MERG64_FIRST(offset), vki_u32, MERGE64_SECOND(offset)); + vki_u32, MERGE64_FIRST(offset), vki_u32, MERGE64_SECOND(offset)); #elif VG_WORDSIZE == 8 PRINT("sys_pwrite64 ( %ld, %#lx, %llu, %lld )", ARG1, ARG2, (ULong)ARG3, (Long)ARG4);