From: Julian Seward <jseward@acm.org>
Date: Wed, 21 Jul 2010 15:28:34 +0000 (+0000)
Subject: Fix compiler warnings with the proc_info wrapper.
X-Git-Tag: svn/VALGRIND_3_6_0~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb8838359336be251939422b868231ba3e90469e;p=thirdparty%2Fvalgrind.git

Fix compiler warnings with the proc_info wrapper.


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

diff --git a/coregrind/m_syswrap/priv_syswrap-darwin.h b/coregrind/m_syswrap/priv_syswrap-darwin.h
index 003d83e5dd..c9bacef401 100644
--- a/coregrind/m_syswrap/priv_syswrap-darwin.h
+++ b/coregrind/m_syswrap/priv_syswrap-darwin.h
@@ -393,7 +393,9 @@ DECL_TEMPLATE(darwin, __pthread_markcancel);    // 332
 DECL_TEMPLATE(darwin, __pthread_canceled);      // 333
 DECL_TEMPLATE(darwin, __semwait_signal);        // 334
 // old utrace
-// NYI proc_info 336
+#if DARWIN_VERS >= DARWIN_10_6 && defined(VGP_amd64_darwin)
+DECL_TEMPLATE(darwin, proc_info);               // 336
+#endif
 DECL_TEMPLATE(darwin, sendfile);                // 337
 DECL_TEMPLATE(darwin, stat64);                  // 338
 DECL_TEMPLATE(darwin, fstat64);                 // 339
diff --git a/coregrind/m_syswrap/syswrap-darwin.c b/coregrind/m_syswrap/syswrap-darwin.c
index 14303e5796..18d602e585 100644
--- a/coregrind/m_syswrap/syswrap-darwin.c
+++ b/coregrind/m_syswrap/syswrap-darwin.c
@@ -3629,7 +3629,7 @@ PRE(proc_info)
                     user_addr_t buffer, int32_t buffersize)
    */
    PRINT("proc_info(%d, %d, %u, %llu, %#lx, %d)",
-         (Int)ARG1, (Int)ARG2, (UInt)ARG3, ARG4, ARG5, (Int)ARG6);
+         (Int)ARG1, (Int)ARG2, (UInt)ARG3, (ULong)ARG4, ARG5, (Int)ARG6);
    PRE_REG_READ6(int, "proc_info",
                  int, callnum, int, pid, unsigned int, flavor,
                  unsigned long long int, arg,