|
From: <sv...@va...> - 2006-10-01 16:17:33
|
Author: sewardj
Date: 2006-10-01 17:17:28 +0100 (Sun, 01 Oct 2006)
New Revision: 6109
Log:
Various minor changes to make these compile on AIX5.
Modified:
branches/AIX5/memcheck/tests/badjump.c
branches/AIX5/memcheck/tests/badjump2.c
branches/AIX5/memcheck/tests/brk.c
branches/AIX5/memcheck/tests/inits.c
branches/AIX5/memcheck/tests/malloc3.c
branches/AIX5/memcheck/tests/malloc3.stdout.exp
branches/AIX5/memcheck/tests/malloc_usable.c
branches/AIX5/memcheck/tests/manuel1.c
branches/AIX5/memcheck/tests/memalign2.c
branches/AIX5/memcheck/tests/pointer-trace.c
branches/AIX5/memcheck/tests/sigprocmask.c
branches/AIX5/memcheck/tests/stack_changes.c
branches/AIX5/memcheck/tests/stack_switch.c
branches/AIX5/memcheck/tests/str_tester.c
branches/AIX5/memcheck/tests/wrap5.c
branches/AIX5/memcheck/tests/wrap8.c
branches/AIX5/memcheck/tests/x86/scalar.h
Modified: branches/AIX5/memcheck/tests/badjump.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/badjump.c 2006-10-01 16:15:58 UTC (rev 6=
108)
+++ branches/AIX5/memcheck/tests/badjump.c 2006-10-01 16:17:28 UTC (rev 6=
109)
@@ -1,7 +1,7 @@
=20
int main ( void )
{
-#if defined(__powerpc64__)
+#if defined(__powerpc64__) || defined(_AIX)
/* on ppc64-linux, a function pointer points to a function
descriptor, not to the function's entry point. Hence to get
uniform behaviour on all supported targets - a jump to 0xE000000
Modified: branches/AIX5/memcheck/tests/badjump2.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/badjump2.c 2006-10-01 16:15:58 UTC (rev =
6108)
+++ branches/AIX5/memcheck/tests/badjump2.c 2006-10-01 16:17:28 UTC (rev =
6109)
@@ -24,7 +24,9 @@
/* Install own SIGSEGV handler */
sigsegv_new.sa_handler =3D SIGSEGV_handler;
sigsegv_new.sa_flags =3D 0;
+#if !defined(_AIX)
sigsegv_new.sa_restorer =3D NULL;
+#endif
res =3D sigemptyset( &sigsegv_new.sa_mask );
assert(res =3D=3D 0);
=20
@@ -33,8 +35,8 @@
=20
if (__builtin_setjmp(myjmpbuf) =3D=3D 0) {
// Jump to zero; will cause seg fault
-#if defined(__powerpc64__)
- unsigned long long int fake_fndescr[3];
+#if defined(__powerpc64__) || defined(_AIX)
+ unsigned long int fake_fndescr[3];
fake_fndescr[0] =3D 0;
fake_fndescr[1] =3D 0;
fake_fndescr[2] =3D 0;
Modified: branches/AIX5/memcheck/tests/brk.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/brk.c 2006-10-01 16:15:58 UTC (rev 6108)
+++ branches/AIX5/memcheck/tests/brk.c 2006-10-01 16:17:28 UTC (rev 6109)
@@ -1,6 +1,8 @@
#include <assert.h>
#include <stdio.h>
-#include <sys/syscall.h>
+#if !defined(_AIX)
+# include <sys/syscall.h>
+#endif
#include <sys/types.h>
#include <unistd.h>
=20
@@ -27,7 +29,9 @@
vals[8] =3D EOL;
=20
for (i =3D 0; EOL !=3D vals[i]; i++) {
+# if !defined(_AIX)
res =3D (void*)syscall(__NR_brk, vals[i]);
+# endif
}
=20
assert( 0 =3D=3D brk(orig_ds) ); // libc brk()
Modified: branches/AIX5/memcheck/tests/inits.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/inits.c 2006-10-01 16:15:58 UTC (rev 610=
8)
+++ branches/AIX5/memcheck/tests/inits.c 2006-10-01 16:17:28 UTC (rev 610=
9)
@@ -11,10 +11,10 @@
int l;
static int ls;
=20
- if (gs =3D=3D 0xDEADBEEF) printf("1!\n");
- if (g =3D=3D 0xDEADBEEF) printf("2!\n");
- if (ls =3D=3D 0xDEADBEEF) printf("3!\n");
- if (l =3D=3D 0xDEADBEEF) printf("4!\n"); // complains
+ if (gs =3D=3D 0xCAFEBABE) printf("1!\n");
+ if (g =3D=3D 0xCAFEBABE) printf("2!\n");
+ if (ls =3D=3D 0xCAFEBABE) printf("3!\n");
+ if (l =3D=3D 0xCAFEBABE) printf("4!\n"); // complains
=20
return 0;
}
Modified: branches/AIX5/memcheck/tests/malloc3.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/malloc3.c 2006-10-01 16:15:58 UTC (rev 6=
108)
+++ branches/AIX5/memcheck/tests/malloc3.c 2006-10-01 16:17:28 UTC (rev 6=
109)
@@ -9,23 +9,23 @@
char* p;
=20
p =3D malloc(0);
- printf("malloc(0) =3D %p\n", p);
+ printf("malloc(0) =3D 0x%lx\n", (unsigned long)p);
free(p);
=20
p =3D malloc(-1);
- printf("malloc(-1) =3D %p\n", p);
+ printf("malloc(-1) =3D 0x%lx\n", (unsigned long)p);
free(p);
=20
p =3D calloc(0,1);
- printf("calloc(0,1) =3D %p\n", p);
+ printf("calloc(0,1) =3D 0x%lx\n", (unsigned long)p);
free(p);
=20
p =3D calloc(0,-1);
- printf("calloc(0,-1) =3D %p\n", p);
+ printf("calloc(0,-1) =3D 0x%lx\n", (unsigned long)p);
free(p);
=20
p =3D calloc(-1,-1);
- printf("calloc(-1,-1) =3D %p\n", p);
+ printf("calloc(-1,-1) =3D 0x%lx\n", (unsigned long)p);
free(p);
=20
return 0;
Modified: branches/AIX5/memcheck/tests/malloc3.stdout.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/malloc3.stdout.exp 2006-10-01 16:15:58 U=
TC (rev 6108)
+++ branches/AIX5/memcheck/tests/malloc3.stdout.exp 2006-10-01 16:17:28 U=
TC (rev 6109)
@@ -1,5 +1,5 @@
malloc(0) =3D 0x........
-malloc(-1) =3D (nil)
+malloc(-1) =3D 0x........
calloc(0,1) =3D 0x........
-calloc(0,-1) =3D (nil)
-calloc(-1,-1) =3D (nil)
+calloc(0,-1) =3D 0x........
+calloc(-1,-1) =3D 0x........
Modified: branches/AIX5/memcheck/tests/malloc_usable.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/malloc_usable.c 2006-10-01 16:15:58 UTC =
(rev 6108)
+++ branches/AIX5/memcheck/tests/malloc_usable.c 2006-10-01 16:17:28 UTC =
(rev 6109)
@@ -7,6 +7,8 @@
{
// Since our allocations are in multiples of 8, 99 will round up to 1=
04.
int* x =3D malloc(99);
+# if !defined(_AIX)
assert(104 =3D=3D malloc_usable_size(x));
+# endif
return 0;
}
Modified: branches/AIX5/memcheck/tests/manuel1.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/manuel1.c 2006-10-01 16:15:58 UTC (rev 6=
108)
+++ branches/AIX5/memcheck/tests/manuel1.c 2006-10-01 16:17:28 UTC (rev 6=
109)
@@ -4,7 +4,7 @@
{
int x;
=20
- printf ("x =3D %d\n", x=3D=3D0xDEADBEEF ? 99 : 88);
+ printf ("x =3D %d\n", x=3D=3D0xCAFEBABE ? 99 : 88);
=20
return 0;
}
Modified: branches/AIX5/memcheck/tests/memalign2.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/memalign2.c 2006-10-01 16:15:58 UTC (rev=
6108)
+++ branches/AIX5/memcheck/tests/memalign2.c 2006-10-01 16:17:28 UTC (rev=
6109)
@@ -25,7 +25,8 @@
int* p;
int res;
assert(sizeof(long int) =3D=3D sizeof(void*));
- =20
+
+# if !defined(_AIX) =20
p =3D memalign(0, 100); assert(0 =3D=3D (long)p % 8);
p =3D memalign(1, 100); assert(0 =3D=3D (long)p % 8);
p =3D memalign(2, 100); assert(0 =3D=3D (long)p % 8);
@@ -44,8 +45,9 @@
p =3D memalign(4095, 100); assert(0 =3D=3D (long)p % 4096);
p =3D memalign(4096, 100); assert(0 =3D=3D (long)p % 4096);
p =3D memalign(4097, 100); assert(0 =3D=3D (long)p % 8192);
+# endif
=20
- #define PM(a,b,c) posix_memalign((void**)a, b, c)
+# define PM(a,b,c) posix_memalign((void**)a, b, c)
=20
res =3D PM(&p, -1,100); assert(EINVAL =3D=3D res);
res =3D PM(&p, 0, 100); assert(0 =3D=3D res && 0 =3D=3D (long)p =
% 8);
Modified: branches/AIX5/memcheck/tests/pointer-trace.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/pointer-trace.c 2006-10-01 16:15:58 UTC =
(rev 6108)
+++ branches/AIX5/memcheck/tests/pointer-trace.c 2006-10-01 16:17:28 UTC =
(rev 6109)
@@ -9,6 +9,10 @@
#include <fcntl.h>
#include <unistd.h>
=20
+#if !defined(MAP_NORESERVE)
+# define MAP_NORESERVE 0
+#endif
+
int main()
{
char **volatile ptrs;
Modified: branches/AIX5/memcheck/tests/sigprocmask.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/sigprocmask.c 2006-10-01 16:15:58 UTC (r=
ev 6108)
+++ branches/AIX5/memcheck/tests/sigprocmask.c 2006-10-01 16:17:28 UTC (r=
ev 6109)
@@ -1,7 +1,9 @@
=20
#include <signal.h>
#include <stdio.h>
-#include <sys/syscall.h>
+#if !defined(_AIX)
+# include <sys/syscall.h>
+#endif
#include <unistd.h>
=20
// Reg test for bug #93328: we were using too-big sigset types, and thus
@@ -11,7 +13,7 @@
{
int x[6], *s, *os, i;
=20
-#if defined(__NR_sigprocmask) && !defined(__powerpc64__)
+#if defined(__NR_sigprocmask) && !defined(__powerpc64__) && !defined(_AI=
X)
=20
x[0] =3D 0x11111111;
x[1] =3D 0x89abcdef;
Modified: branches/AIX5/memcheck/tests/stack_changes.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/stack_changes.c 2006-10-01 16:15:58 UTC =
(rev 6108)
+++ branches/AIX5/memcheck/tests/stack_changes.c 2006-10-01 16:17:28 UTC =
(rev 6109)
@@ -10,10 +10,16 @@
// This test is checking the libc context calls (setcontext, etc.) and
// checks that Valgrind notices their stack changes properly.
=20
-struct ucontext ctx1, ctx2, oldc;
+#if defined(_AIX)
+typedef ucontext_t mycontext;
+#else /* linux */
+typedef struct ucontext mycontext;
+#endif
+
+mycontext ctx1, ctx2, oldc;
int count;
=20
-void hello(struct ucontext *newc)
+void hello(mycontext *newc)
{
printf("hello, world: %d\n", count);
if (count++ =3D=3D 2)
@@ -21,7 +27,7 @@
setcontext(newc);
}
=20
-int init_context(struct ucontext *uc)
+int init_context(mycontext *uc)
{
void *stack;
int ret;
Modified: branches/AIX5/memcheck/tests/stack_switch.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/stack_switch.c 2006-10-01 16:15:58 UTC (=
rev 6108)
+++ branches/AIX5/memcheck/tests/stack_switch.c 2006-10-01 16:17:28 UTC (=
rev 6109)
@@ -1,8 +1,18 @@
#define _XOPEN_SOURCE 600
#define _BSD_SOURCE
=20
+#include <stdio.h>
+
+#if defined(_AIX)
+int main(int argc, char **argv)=20
+{
+ printf("this test is linux-specific\n");
+ return 0;
+}
+
+#else
+
#include <sched.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
@@ -53,3 +63,5 @@
=20
exit( 0 );
}
+
+#endif /* !defined(_AIX) */
Modified: branches/AIX5/memcheck/tests/str_tester.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/str_tester.c 2006-10-01 16:15:58 UTC (re=
v 6108)
+++ branches/AIX5/memcheck/tests/str_tester.c 2006-10-01 16:17:28 UTC (re=
v 6109)
@@ -463,6 +463,7 @@
}
}
=20
+#if !defined(_AIX)
static void
test_strchrnul (void)
{
@@ -496,7 +497,9 @@
}
}
}
+#endif /* !defined(_AIX) */
=20
+#if !defined(_AIX)
static void
test_rawmemchr (void)
{
@@ -523,6 +526,7 @@
}
}
}
+#endif /* !defined(_AIX) */
=20
static void
test_index (void)
@@ -570,6 +574,7 @@
}
}
=20
+#if !defined(_AIX)
static void
test_memrchr (void)
{
@@ -615,6 +620,7 @@
}
}
}
+#endif /* !defined(_AIX) */
=20
static void
test_rindex (void)
@@ -890,6 +896,7 @@
equal(one+4, "c", 50);
=20
{
+# if !defined(_AIX)
char text[] =3D "This,is,a,test";
char *list =3D strdupa (text);
equal (strsep (&list, ","), "This", 51);
@@ -897,6 +904,7 @@
equal (strsep (&list, ","), "a", 53);
equal (strsep (&list, ","), "test", 54);
check (strsep (&list, ",") =3D=3D NULL, 55);
+# endif
}
=20
cp =3D strcpy(one, "a,b, c,, ,d,");
@@ -1049,6 +1057,7 @@
}
}
=20
+#if !defined(_AIX)
static void
test_mempcpy (void)
{
@@ -1085,6 +1094,7 @@
equal (two, "hi there", 12 + (i * 6));
}
}
+#endif /* !defined(_AIX) */
=20
static void
test_memmove (void)
@@ -1390,11 +1400,15 @@
/* strchr. */
test_strchr ();
=20
+# if !defined(_AIX)
/* strchrnul. */
test_strchrnul ();
+# endif
=20
+# if !defined(_AIX)
/* rawmemchr. */
test_rawmemchr ();
+# endif
=20
/* index - just like strchr. */
test_index ();
@@ -1402,8 +1416,10 @@
/* strrchr. */
test_strrchr ();
=20
+# if !defined(_AIX)
/* memrchr. */
test_memrchr ();
+# endif
=20
/* rindex - just like strrchr. */
test_rindex ();
@@ -1441,8 +1457,10 @@
/* memmove - must work on overlap. */
test_memmove ();
=20
+# if !defined(_AIX)
/* mempcpy */
test_mempcpy ();
+# endif
=20
/* memccpy. */
test_memccpy ();
@@ -1479,7 +1497,7 @@
else
{
status =3D EXIT_FAILURE;
- printf("%Zd errors.\n", errors);
+ printf("%d errors.\n", (int)errors);
}
=20
return status;
Modified: branches/AIX5/memcheck/tests/wrap5.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/wrap5.c 2006-10-01 16:15:58 UTC (rev 610=
8)
+++ branches/AIX5/memcheck/tests/wrap5.c 2006-10-01 16:17:28 UTC (rev 610=
9)
@@ -1,6 +1,7 @@
=20
#include <stdio.h>
#include <malloc.h>
+#include <stdlib.h>
#include "valgrind.h"
=20
/* As wrap4.c, but also throw in various calls to another redirected
Modified: branches/AIX5/memcheck/tests/wrap8.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/wrap8.c 2006-10-01 16:15:58 UTC (rev 610=
8)
+++ branches/AIX5/memcheck/tests/wrap8.c 2006-10-01 16:17:28 UTC (rev 610=
9)
@@ -1,6 +1,7 @@
=20
#include <stdio.h>
#include <malloc.h>
+#include <stdlib.h>
#include "valgrind.h"
=20
/* This is the same as wrap5.c, except that the recursion depth is 16.
Modified: branches/AIX5/memcheck/tests/x86/scalar.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/memcheck/tests/x86/scalar.h 2006-10-01 16:15:58 UTC (re=
v 6108)
+++ branches/AIX5/memcheck/tests/x86/scalar.h 2006-10-01 16:17:28 UTC (re=
v 6109)
@@ -1,4 +1,4 @@
-#include "../../../coregrind/vki_unistd-x86-linux.h"
+#include "../../../include/vki/vki-scnums-x86-linux.h"
=20
#include <assert.h>
#include <errno.h>
|