Merge branch 'master' into next

2014-01-23 22:20:16 +01:00 · 2014-01-23 22:20:16 +01:00 · cacc199a68
parent 61b53603e2 7aa5be9d41
commit cacc199a68
1 changed files with 1 additions and 1 deletions
--- a/src/log.c
+++ b/src/log.c
@ -129,7 +129,7 @@ void open_logbuffer(void) {
            return;
        }

-#if defined(__APPLE__)
+#if defined(__OpenBSD__) || defined(__APPLE__)
        if (ftruncate(logbuffer_shm, logbuffer_size) == -1) {
            fprintf(stderr, "Could not ftruncate SHM segment for the i3 log: %s\n", strerror(errno));
 #else