From 4ef378fcd5978e2cb14c0d172ec9aae81bcc81ba Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Tue, 17 Dec 2013 20:47:08 +0400
Subject: [PATCH] Fix Mac OS X build.
---
src/lib/small/slab_arena.c | 2 +-
test/unit/arena_mt.c | 4 ++--
test/unit/lf_lifo.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/small/slab_arena.c b/src/lib/small/slab_arena.c
index 72ee273f8b..798c496f8b 100644
--- a/src/lib/small/slab_arena.c
+++ b/src/lib/small/slab_arena.c
@@ -35,7 +35,7 @@
#include <assert.h>
#include <limits.h>
-#if defined(__FreeBSD__)
+#if !defined(MAP_ANONYMOUS)
#define MAP_ANONYMOUS MAP_ANON
#endif
diff --git a/test/unit/arena_mt.c b/test/unit/arena_mt.c
index 87028b4d64..725d63b6fd 100644
--- a/test/unit/arena_mt.c
+++ b/test/unit/arena_mt.c
@@ -16,7 +16,7 @@ int FILL = SLAB_MIN_SIZE/sizeof(pthread_t);
void *
run(void *p __attribute__((unused)))
{
- unsigned int seed = pthread_self();
+ unsigned int seed = (unsigned int) pthread_self();
int iterations = rand_r(&seed) % ITERATIONS;
pthread_t **slabs = slab_map(&arena);
for (int i = 0; i < iterations; i++) {
@@ -27,7 +27,7 @@ run(void *p __attribute__((unused)))
slabs[osc][fill] = pthread_self();
}
}
- pthread_yield();
+ sched_yield();
for (int osc = 0; osc < oscillation; osc++) {
for (int fill = 0; fill < FILL; fill+= 100) {
fail_unless(slabs[osc][fill] ==
diff --git a/test/unit/lf_lifo.c b/test/unit/lf_lifo.c
index 3f6cb6917d..1c959ee37b 100644
--- a/test/unit/lf_lifo.c
+++ b/test/unit/lf_lifo.c
@@ -2,7 +2,7 @@
#include "unit.h"
#include <sys/mman.h>
-#if defined(__FreeBSD__)
+#if !defined(MAP_ANONYMOUS)
#define MAP_ANONYMOUS MAP_ANON
#endif
--
GitLab