diff options
| author | Jeremy Huddleston Sequoia <jeremyhu@macports.org> | 2016-07-03 22:57:16 -0700 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2016-07-03 23:00:56 -0700 |
| commit | 96c3ac0ae69f2a3dea6fea6fdc3a217853108cdb (patch) | |
| tree | 49e0a8ecc408882b66f85c728c64980d4e6cf1fd | |
| parent | 8a7253575c58134bb33b2b24f10eec7ce7bd051d (diff) | |
| download | jack1-96c3ac0ae69f2a3dea6fea6fdc3a217853108cdb.tar.gz | |
Check for clock_nanosleep before use
Fixes a build failure on macOS 10.12 Sierra
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | drivers/dummy/dummy_driver.c | 2 | ||||
| -rw-r--r-- | drivers/dummy/dummy_driver.h | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 49cf862..85e32d8 100644 --- a/configure.ac +++ b/configure.ac @@ -285,6 +285,20 @@ AC_CHECK_FUNC(clock_gettime, ]) ) +AC_CHECK_FUNC(clock_nanosleep, + [ + AC_DEFINE(HAVE_CLOCK_NANOSLEEP,0,"Whether or not clock_nanosleep can be found in system libraries") + ], + # + # if not found, check librt specifically + # + AC_CHECK_LIB(rt, clock_nanosleep, + [ + AC_DEFINE(HAVE_CLOCK_NANOSLEEP,1,"Whether or not clock_nanosleep can be found in system libraries") + OS_LDFLAGS="$OS_LDFLAGS -lrt" + ]) +) + # should we use mlockall() on this platform? if test "x$JACK_DO_NOT_MLOCK" = "x"; then AC_CHECK_HEADER(sys/mman.h, diff --git a/drivers/dummy/dummy_driver.c b/drivers/dummy/dummy_driver.c index d414cb1..b8e1b9c 100644 --- a/drivers/dummy/dummy_driver.c +++ b/drivers/dummy/dummy_driver.c @@ -73,7 +73,7 @@ FakeVideoSync ( dummy_driver_t *driver ) } } -#ifdef HAVE_CLOCK_GETTIME +#if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CLOCK_NANOSLEEP) static inline unsigned long long ts_to_nsec (struct timespec ts) { return ts.tv_sec * 1000000000LL + ts.tv_nsec; diff --git a/drivers/dummy/dummy_driver.h b/drivers/dummy/dummy_driver.h index 296f027..4daf182 100644 --- a/drivers/dummy/dummy_driver.h +++ b/drivers/dummy/dummy_driver.h @@ -43,7 +43,7 @@ struct _dummy_driver { jack_nframes_t period_size; unsigned long wait_time; -#ifdef HAVE_CLOCK_GETTIME +#if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CLOCK_NANOSLEEP) struct timespec next_wakeup; #else jack_time_t next_time; |