Removed some Darwin-specific code that crept in from the DARWIN branch.

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

diff --git a/tests/asm.h b/tests/asm.h
index d64a893f756176e7c97214e81ba92d5946086d23..0fd5cb3bacd9213d0677d685bd57c08d53485500 100644 (file)
--- a/tests/asm.h
+++ b/tests/asm.h
@@ -5,15 +5,7 @@
 // general, any symbol named in asm code should be wrapped by VG_SYM.
 
 // This one is for use in inline asm in C files.
-#if defined(VGO_darwin)
-#define VG_SYM(x) "_"#x
-#else
 #define VG_SYM(x) #x
-#endif
 
 // This one is for use in asm files.
-#if defined(VGO_darwin)
 #define VG_SYM_ASM(x) _#x
-#else
-#define VG_SYM_ASM(x) x
-#endif

diff --git a/tests/malloc.h b/tests/malloc.h
index 0179b387cc393937cf8ab2bb73a625a82ff8325a..454d2cff6a52376067a2a2b599f85f444fef1d0d 100644 (file)
--- a/tests/malloc.h
+++ b/tests/malloc.h
@@ -1,11 +1,7 @@
 // Replacement for malloc.h which factors out platform differences.
 
 #include <stdlib.h>
-#if defined(VGO_darwin)
-#  include <malloc/malloc.h>
-#else
-#  include <malloc.h>
-#endif
+#include <malloc.h>
 
 #include <assert.h>
 
@@ -14,12 +10,7 @@ __attribute__((unused))
 static void* memalign16(size_t szB)
 {
    void* x;
-#if defined(VGO_darwin)
-   // Darwin lacks memalign, but its malloc is always 16-aligned anyway.
-   x = malloc(szB);
-#else
    x = memalign(16, szB);
-#endif
    assert(x);
    assert(0 == ((16-1) & (unsigned long)x));
    return x;

diff --git a/tests/sys_mman.h b/tests/sys_mman.h
index 7ac64d54c4d045636ac1b46ea1e53853ea04e147..862bccc13dfce47a828181b9786beb5f3944b3e1 100644 (file)
--- a/tests/sys_mman.h
+++ b/tests/sys_mman.h
@@ -2,10 +2,6 @@
 
 #include <sys/mman.h>
 
-#if defined(VGO_darwin)
-#  define MAP_ANONYMOUS MAP_ANON
-#endif
-
 
 #include <assert.h>
 #include <unistd.h>