From b4ba9ec0896565fec775594e7273cc82a79f41de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Cr=C3=AAte?= Date: Fri, 27 Dec 2019 12:36:10 -0500 Subject: [PATCH] systemclock: No need to check for CLOCK_TAI in the meson POSIX defines CLOCK_MONOTONIC to always be a macro, so I think it's safe to assume that CLOCK_TAI will also be. --- gst/gstsystemclock.c | 2 +- meson.build | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c index 9b1a82e..adfc117 100644 --- a/gst/gstsystemclock.c +++ b/gst/gstsystemclock.c @@ -561,7 +561,7 @@ clock_type_to_posix_id (GstClockType clock_type) else #endif if (clock_type == GST_CLOCK_TYPE_TAI) -#ifdef HAVE_TAI_CLOCK +#ifdef CLOCK_TAI return CLOCK_TAI; #else GST_ERROR diff --git a/meson.build b/meson.build index 69b3a2c..a35188c 100644 --- a/meson.build +++ b/meson.build @@ -256,7 +256,7 @@ if cc.links('''#include cdata.set('HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID', 1) endif -# Check for posix timers, monotonic clock and TAI clock +# Check for posix timers and monotonic clock time_prefix = '#include \n' if cdata.has('HAVE_UNISTD_H') time_prefix += '#include ' @@ -280,15 +280,6 @@ if cc.compiles(monotonic_clock_src, name : 'monotonic clock from time.h') cdata.set('HAVE_MONOTONIC_CLOCK', 1) endif -tai_clock_src = time_prefix + ''' -#if !defined(CLOCK_TAI) -#error CLOCK_TAI not defined -#endif -''' -if cc.compiles(tai_clock_src, name : 'TAI clock from time.h') - cdata.set('HAVE_TAI_CLOCK', 1) -endif - # Check for __uint128_t (gcc) by checking for 128-bit division uint128_t_src = '''int main() { static __uint128_t v1 = 100; -- 2.7.4