make it compile on FreeBSD

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

diff --git a/none/tests/.cvsignore b/none/tests/.cvsignore
index a12008d22b8f7683e4a4fe16601756e399eea495..b5481a29b4fcea0c3d08187c9808a9302f09bd3d 100644 (file)
--- a/none/tests/.cvsignore
+++ b/none/tests/.cvsignore
@@ -14,7 +14,9 @@ fork
 fpu_lazy_eflags
 fucomip
 gxx304
+map_unmap
 munmap_exe
+mremap
 pluto
 pth_blockedsig
 rcl_assert

diff --git a/none/tests/bitfield1.c b/none/tests/bitfield1.c
index 183c7e85444ab9528d646cd1e993d5aa76817b7d..1dcf4c9493a6c9d0825773333c50e2b8fc22cb91 100644 (file)
--- a/none/tests/bitfield1.c
+++ b/none/tests/bitfield1.c
@@ -1,5 +1,5 @@
 
-#include <malloc.h>
+#include <stdlib.h>
 
 typedef
    struct {

diff --git a/none/tests/map_unmap.c b/none/tests/map_unmap.c
index db47d240d63601e21f11ae444bea0ef6c6fcfcf5..a38272295df8e3915a395db42679099c1a8fdb93 100644 (file)
--- a/none/tests/map_unmap.c
+++ b/none/tests/map_unmap.c
@@ -10,7 +10,7 @@ static unsigned int pagesize;
 
 static void *domap(void)
 {
-       void *ret = mmap(0, LEN, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+       void *ret = mmap(0, LEN, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
 
        if (ret == (void *)-1) {
                perror("mmap");

diff --git a/none/tests/munmap_exe.c b/none/tests/munmap_exe.c
index e17d885341170ed6570e4817a9e84c5c2b0e2cad..3a8acb0c9428e296e34e3cd1071642790f001733 100644 (file)
--- a/none/tests/munmap_exe.c
+++ b/none/tests/munmap_exe.c
@@ -11,7 +11,7 @@ int main()
 {
     void* m;
     
-    m = mmap(NULL, 100, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+    m = mmap(NULL, 100, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0);
 
     if (m == (void*)-1) {
        fprintf(stderr, "error mmapping\n");

diff --git a/none/tests/resolv.c b/none/tests/resolv.c
index 119261a91069c1d93e52662cdec50ece63d1d896..0571022a1ee1dd4648a5165020065aa0ce91c4b9 100644 (file)
--- a/none/tests/resolv.c
+++ b/none/tests/resolv.c
@@ -1,4 +1,5 @@
 
+#include <netinet/in.h>
 #include <resolv.h>
 #include <stdio.h>
 

diff --git a/none/tests/sha1_test.c b/none/tests/sha1_test.c
index e83694854c684588e04e25c057a3ba1d4b63ce20..c47a74d3ccdd174500e10876ea506f4ecb878e9e 100644 (file)
--- a/none/tests/sha1_test.c
+++ b/none/tests/sha1_test.c
@@ -42,6 +42,8 @@ A million repetitions of "a"
 
 #define SHA1HANDSOFF
 
+#include <config.h>
+
 #include <string.h>
 #include <sys/types.h> /* for u_int*_t */
 
@@ -63,7 +65,14 @@ void SHA1Init(SHA1_CTX* context);
 void SHA1Update(SHA1_CTX* context, const unsigned char* data, u_int32_t len);
 void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
 /* ================ end of sha1.h ================ */
+
+#ifdef HAVE_SYS_ENDIAN_H
+#include <sys/endian.h>
+#endif
+
+#ifdef HAVE_ENDIAN_H
 #include <endian.h>
+#endif
 
 #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))