summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Knoth <adi@drcomp.erfurt.thur.de>2017-01-10 00:39:57 +0100
committerAdrian Knoth <adi@drcomp.erfurt.thur.de>2017-01-10 00:39:57 +0100
commit5bb11a71f48de1e361731224abe83e3e79d7b905 (patch)
tree3b79f3a4c54cbbcd13f13ebed6f1c95d87670697
parent3e26d4ff92789d8e4b379d50fec2de9c4471c2e1 (diff)
downloadjack1-5bb11a71f48de1e361731224abe83e3e79d7b905.tar.gz
Use #if for HAVE_CLOCK_GETTIME in dummy driver
ifdef is useless, since the value is always defined (either to 1 or 0) in config.h. Fix taken from https://svnweb.freebsd.org/ports/head/audio/jack/files/patch-drivers_dummy_dummy__driver.c?view=markup
-rw-r--r--drivers/dummy/dummy_driver.c2
-rw-r--r--drivers/dummy/dummy_driver.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dummy/dummy_driver.c b/drivers/dummy/dummy_driver.c
index 361ab9a..aec7e4d 100644
--- a/drivers/dummy/dummy_driver.c
+++ b/drivers/dummy/dummy_driver.c
@@ -73,7 +73,7 @@ FakeVideoSync ( dummy_driver_t *driver )
}
}
-#if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CLOCK_NANOSLEEP)
+#if HAVE_CLOCK_GETTIME && 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 4daf182..1b7c305 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;
-#if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CLOCK_NANOSLEEP)
+#if HAVE_CLOCK_GETTIME && HAVE_CLOCK_NANOSLEEP
struct timespec next_wakeup;
#else
jack_time_t next_time;