nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix the build on OS X 

OS X doesn't have posix_fallocate() yet, so put
bf760d0241 in
    #if defined(__APPLE__)

the cd fails with:
    /bin/sh: line 0: cd: include: No such file or directory
so give it a path relative to the top directory
This commit is contained in:
Jean-Philippe Ouellet 2013-11-26 05:41:56 -05:00 committed by Michael Stapelberg
parent 18cfc36408
commit 755188220f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/i3.mk
View File

@ -54,12 +54,12 @@ src/config_parser.o: src/config_parser.c $(i3_HEADERS_DEP) i3-config-parser.stam
i3-command-parser.stamp: generate-command-parser.pl parser-specs/commands.spec i3-command-parser.stamp: generate-command-parser.pl parser-specs/commands.spec
echo "[i3] Generating command parser" echo "[i3] Generating command parser"
(cd include; ../generate-command-parser.pl --input=../parser-specs/commands.spec --prefix=command) (cd $(TOPDIR)/include; ../generate-command-parser.pl --input=../parser-specs/commands.spec --prefix=command)
touch $@ touch $@
i3-config-parser.stamp: generate-command-parser.pl parser-specs/config.spec i3-config-parser.stamp: generate-command-parser.pl parser-specs/config.spec
echo "[i3] Generating config parser" echo "[i3] Generating config parser"
(cd include; ../generate-command-parser.pl --input=../parser-specs/config.spec --prefix=config) (cd $(TOPDIR)/include; ../generate-command-parser.pl --input=../parser-specs/config.spec --prefix=config)
touch $@ touch $@
i3: libi3.a $(i3_OBJECTS) i3: libi3.a $(i3_OBJECTS)

7
src/log.c
View File

@ -129,11 +129,16 @@ void open_logbuffer(void) {
return; return;
} }
#if 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
int ret; int ret;
if ((ret = posix_fallocate(logbuffer_shm, 0, logbuffer_size)) != 0) { if ((ret = posix_fallocate(logbuffer_shm, 0, logbuffer_size)) != 0) {
fprintf(stderr, "Could not ftruncate SHM segment for the i3 log: %s\n", strerror(ret));
#endif
close(logbuffer_shm); close(logbuffer_shm);
shm_unlink(shmlogname); shm_unlink(shmlogname);
fprintf(stderr, "Could not ftruncate SHM segment for the i3 log: %s\n", strerror(ret));
return; return;
} }