[Valgrind-developers] valgrind

[Julian S. <js...@ac...>]

CVS commit by jseward: 

Build fixes for the regtest suite on gcc-2.96.


  M +4 -3      memcheck/tests/scalar.c   1.54
  M +4 -4      memcheck/tests/str_tester.c   1.2
  M +1 -1      none/tests/thread-exits.c   1.4


--- valgrind/memcheck/tests/scalar.c  #1.53:1.54
@@ -15,4 +15,8 @@
 // always issue an error message immediately before these seg faults occur).
 
+#include <asm/ipc.h>
+#include <sched.h>
+#include <signal.h>
+
 int main(void)
 {
@@ -513,5 +517,4 @@ int main(void)
    // XXX: Also, should be 6 scalar errors, except glibc's syscall() doesn't
    //      use the 6th one!
-   #include <asm/ipc.h>
    GO(__NR_ipc, "5s 0m");
    SY(__NR_ipc, x0+4, x0, x0, x0, x0, x0); FAIL;
@@ -526,6 +529,4 @@ int main(void)
 
    // __NR_clone 120
-   #include <sched.h>
-   #include <signal.h>
 #ifndef CLONE_PARENT_SETTID
 #define CLONE_PARENT_SETTID     0x00100000

--- valgrind/memcheck/tests/str_tester.c  #1.1:1.2
@@ -176,8 +176,8 @@ test_strcpy (void)
 
   /* Simple test using implicitly coerced `void *' arguments.  */
-  const void *src = "frobozz";
+  { const void *src = "frobozz";
   void *dst = one;
   check (strcpy (dst, src) == dst, 1);
-  equal (dst, "frobozz", 2);
+    equal (dst, "frobozz", 2); }
 }
 

--- valgrind/none/tests/thread-exits.c  #1.3:1.4
@@ -93,4 +93,5 @@ int main()
         sigset_t mask;
         int status;
+        struct sigaction sa;
 
         sigemptyset(&mask);
@@ -98,5 +99,4 @@ int main()
         sigprocmask(SIG_BLOCK, &mask, NULL);
 
-        struct sigaction sa;
         sa.sa_handler = handler;
         sa.sa_flags = 0;