Merge r6109:

Various minor changes to make these compile on AIX5.


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

memcheck/tests/stack_changes.c

@@ -10,10 +10,16 @@
 // This test is checking the libc context calls (setcontext, etc.) and
 // checks that Valgrind notices their stack changes properly.
 
-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;
 
-void hello(struct ucontext *newc)
+void hello(mycontext *newc)
 {
     printf("hello, world: %d\n", count);
     if (count++ == 2)
@@ -21,7 +27,7 @@ void hello(struct ucontext *newc)
     setcontext(newc);
 }
 
-int init_context(struct ucontext *uc)
+int init_context(mycontext *uc)
 {
     void *stack;
     int ret;