From: Nicholas Nethercote <njn@valgrind.org>
Date: Wed, 29 Apr 2009 02:02:19 +0000 (+0000)
Subject: Merge r9666 (badseg portability tweak) from the DARWIN branch.
X-Git-Tag: svn/VALGRIND_3_5_0~756
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5976184a6858a3ac49583266239ebc695115cabd;p=thirdparty%2Fvalgrind.git

Merge r9666 (badseg portability tweak) from the DARWIN branch.



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

diff --git a/none/tests/x86/badseg.c b/none/tests/x86/badseg.c
index 50335e9933..2cc1450dda 100644
--- a/none/tests/x86/badseg.c
+++ b/none/tests/x86/badseg.c
@@ -4,8 +4,8 @@
 
 static void handler(int sig, siginfo_t *info, void *v)
 {
-	printf("info: sig=%d code=%d addr=%p\n",
-	       info->si_signo, info->si_code, info->si_addr);
+	printf("info: sig=%d code=%d addr=0x%lx\n",
+	       info->si_signo, info->si_code, (unsigned long)info->si_addr);
 	exit(0);
 }
 
diff --git a/none/tests/x86/badseg.stdout.exp b/none/tests/x86/badseg.stdout.exp
index 40a293750f..c8a7a90c53 100644
--- a/none/tests/x86/badseg.stdout.exp
+++ b/none/tests/x86/badseg.stdout.exp
@@ -1 +1 @@
-info: sig=11 code=128 addr=(nil)
+info: sig=11 code=128 addr=0x0