Fix compilation on FreeBSD. extracted from patch by Doug Rabson <dfr@nlsystems.com>

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

memcheck/tests/custom_alloc.c

@@ -14,7 +14,7 @@
 void* get_superblock(void)
 {
    void* p = mmap( 0, SUPERBLOCK_SIZE, PROT_READ|PROT_WRITE|PROT_EXEC,
-                   MAP_PRIVATE|MAP_ANONYMOUS, -1, 0 );
+                   MAP_PRIVATE|MAP_ANON, -1, 0 );
 
    assert(p != ((void*)(-1)));
 

memcheck/tests/filter_allocs

@@ -1,6 +1,6 @@
 #! /bin/sh
 
 ./filter_stderr |
-sed "s/malloc\/free: in use at exit: [0-9]\+ bytes in [0-9]\+ blocks./malloc\/free: in use at exit: ... bytes in ... blocks./" |
-sed "s/malloc.free: [0-9]\+ allocs, [0-9]\+ frees, [0-9]\+ bytes allocated./malloc\/free: ... allocs, ... frees, ... bytes allocated./"
+sed "s/malloc\/free: in use at exit: [0-9]* bytes in [0-9]* blocks./malloc\/free: in use at exit: ... bytes in ... blocks./" |
+sed "s/malloc.free: [0-9]* allocs, [0-9]* frees, [0-9]* bytes allocated./malloc\/free: ... allocs, ... frees, ... bytes allocated./"
 

memcheck/tests/filter_leak_check_size

@@ -1,4 +1,4 @@
 #! /bin/sh
 
 ./filter_stderr |
-sed "s/checked [0-9]\+ bytes./checked ... bytes./"
+sed "s/checked [0-9]* bytes./checked ... bytes./"

memcheck/tests/filter_stderr

@@ -8,7 +8,7 @@ $dir/../../tests/filter_stderr_basic                    |
 $dir/../../tests/filter_addresses                       |
 
 # Anonymise line numbers in mac_replace_strmem.c
-sed "s/mac_replace_strmem.c:[0-9]\+/mac_replace_strmem.c:.../"  |
+sed "s/mac_replace_strmem.c:[0-9]*/mac_replace_strmem.c:.../"  |
 
 $dir/../../tests/filter_test_paths                      |
 

memcheck/tests/manuel2.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 int main ()
 {

memcheck/tests/manuel3.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 int gcc_cant_inline_me ( int );
 

memcheck/tests/metadata.c

@@ -1,6 +1,6 @@
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "../memcheck.h"
 
 /* Program demonstrating copying of metadata in memcheck. */

memcheck/tests/nanoleak.c

@@ -1,5 +1,5 @@
 
-#include <malloc.h>
+#include <stdlib.h>
 
 int main ( void )
 {

memcheck/tests/realloc2.c

@@ -3,7 +3,7 @@
    realloc time due to bad ordering of the things happening.  Now runs
    without error. */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 
 int main ( void )

memcheck/tests/sigaltstack.c

@@ -1,7 +1,7 @@
 
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <signal.h>
 #include <sys/mman.h>
 
@@ -15,7 +15,7 @@ int main(int argv, char** argc) {
   stack_t sigstk;
   struct sigaction act;
   static const int size = SIGSTKSZ*2;
-  char *stk = (char *)mmap(0, size, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
+  char *stk = (char *)mmap(0, size, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0);
   sigstk.ss_sp = stk;
 
   sigstk.ss_size = size;

memcheck/tests/zeropage.c

@@ -12,25 +12,25 @@ int main(void)
 {
    /* mmap(0x0, ... FIXED) should fail */
    int* m = mmap(0x0, 1000000, PROT_READ|PROT_WRITE, 
-                 MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0);
+                 MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m != (int*)-1)
       printf("succeeded?!\n");
 
    /* mmap(0x1000, ... FIXED) should fail */
         m = mmap((void*)0x1000, 1000000, PROT_READ|PROT_WRITE, 
-                 MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0);
+                 MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m != (int*)-1)
       printf("succeeded?!\n");
 
    /* mmap(0xa000, ... FIXED) should fail */
         m = mmap((void*)0xa000, 1000000, PROT_READ|PROT_WRITE, 
-                 MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0);
+                 MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m != (int*)-1)
       printf("succeeded?!\n");
 
    /* mmap(0x10000, ... FIXED) should fail */
         m = mmap((void*)0x10000, 1000000, PROT_READ|PROT_WRITE, 
-                 MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0);
+                 MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m == (int*)-1)
       printf("failed?!\n");