summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-09-08 10:34:16 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-09-08 10:34:16 +0200
commitecdf47b97abb8c5107846f4ef4a17bd62ba6dc82 (patch)
tree7bb1e6ab8131d1d679f5a5bb5e5953e4a60d3986 /src
parentb9793ab68aa321b0dac14d1dff5789edb95ad0bb (diff)
parent2e561a634ae3e747b293a4e05eaf44726968dc1a (diff)
downloadouroboros-ecdf47b97abb8c5107846f4ef4a17bd62ba6dc82.tar.gz
ouroboros-ecdf47b97abb8c5107846f4ef4a17bd62ba6dc82.zip
Merged in dstaesse/ouroboros/be-apple (pull request #250)
lib: Fix shm for evil devices
Diffstat (limited to 'src')
-rw-r--r--src/lib/lockfile.c4
-rw-r--r--src/lib/shm_ap_rbuff.c4
-rw-r--r--src/lib/shm_rdrbuff.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/lockfile.c b/src/lib/lockfile.c
index 81bed687..04ce9324 100644
--- a/src/lib/lockfile.c
+++ b/src/lib/lockfile.c
@@ -64,13 +64,13 @@ struct lockfile * lockfile_create() {
free(lf);
return NULL;
}
-
+#ifndef __APPLE__
if (write(lf->fd, "", 1) != 1) {
LOG_DBGF("Failed to finalise lockfile.");
free(lf);
return NULL;
}
-
+#endif
lf->api = mmap(NULL,
LF_SIZE, PROT_READ | PROT_WRITE,
MAP_SHARED,
diff --git a/src/lib/shm_ap_rbuff.c b/src/lib/shm_ap_rbuff.c
index 473894d5..d9e332fe 100644
--- a/src/lib/shm_ap_rbuff.c
+++ b/src/lib/shm_ap_rbuff.c
@@ -104,13 +104,13 @@ static struct shm_ap_rbuff * shm_ap_rbuff_create(bool dir)
free(rb);
return NULL;
}
-
+#ifndef __APPLE__
if (write(shm_fd, "", 1) != 1) {
LOG_DBG("Failed to finalise extension of ringbuffer.");
free(rb);
return NULL;
}
-
+#endif
shm_base = mmap(NULL,
SHM_RBUFF_FILE_SIZE,
PROT_READ | PROT_WRITE,
diff --git a/src/lib/shm_rdrbuff.c b/src/lib/shm_rdrbuff.c
index 7c4927fc..bf5c7f16 100644
--- a/src/lib/shm_rdrbuff.c
+++ b/src/lib/shm_rdrbuff.c
@@ -190,14 +190,14 @@ struct shm_rdrbuff * shm_rdrbuff_create()
free(rdrb);
return NULL;
}
-
+#ifndef __APPLE
if (write(shm_fd, "", 1) != 1) {
LOG_DBGF("Failed to finalise extension of shared memory map.");
free(shm_rdrb_fn);
free(rdrb);
return NULL;
}
-
+#endif
shm_base = mmap(NULL,
SHM_FILE_SIZE,
PROT_READ | PROT_WRITE,