<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/902707d4f813a44c18a665217edadac162e694a6">https://github.com/macports/macports-ports/commit/902707d4f813a44c18a665217edadac162e694a6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 902707d osmocore: update to bf86d71f (20180305).
</span>902707d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 902707d4f813a44c18a665217edadac162e694a6
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Mar 8 11:04:33 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> osmocore: update to bf86d71f (20180305).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * add patches to fix various compile issues on macOS.
</span><span style='display:block; white-space:pre;color:#404040;'> * tweak patch offsets for update.
</span>---
science/osmocore/Portfile | 21 +++-
science/osmocore/files/patch-configure.ac.diff | 29 +++++
science/osmocore/files/patch-fix-python.diff | 4 +-
.../files/patch-src_timer_clockgettime.c.diff | 136 +++++++++++++++++++++
4 files changed, 182 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/Portfile b/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 941d26b..483ecf5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,11 +12,11 @@ categories science comms
</span> license GPL-3
platforms darwin macosx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup osmocom libosmocore 6950b191e84c73687f9dc77462ff66cbeaec5686
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20180226
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bc35cd00b469cd029b4894942f29ad16cdffdc5b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 56f63e1d5de27998331f826b2a5f6404c4d750b410736465901f96892e1b6c2c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup osmocom libosmocore bf86d71f58f83f53e740d64e649884c91ee77c26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20180305
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 244ae43a206f3f80604886dd916bed254aea4023 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3059c1df33a82cbb0a022aee5e10684fd742855cb6ab0d1275b034da3adfd048 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 983289
</span>
depends_build-append \
port:automake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,10 +53,19 @@ patchfiles-append patch-include_osmocom_core_stats.h
</span>
patchfiles-append patch-include_osmocom_coding_gsm0503_parity.h
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# update configure.ac to current automake standards
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix 'timer_clockgettime.c' to work with OSs that don't provide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the function 'clock_gettime' and/or its various options.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-src_timer_clockgettime.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # use autotools to get ready to configure
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "touch config.h.in && ${prefix}/bin/glibtoolize -i && ${prefix}/bin/aclocal && ${prefix}/bin/automake -a && ${prefix}/bin/autoconf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${prefix}/bin/glibtoolize -v -i -W all && ${prefix}/bin/aclocal -I m4 && ${prefix}/bin/autoheader && ${prefix}/bin/autoconf && ${prefix}/bin/automake -a --gnu"
</span> }
# remove top-level library path, such that internal libraries are used
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-configure.ac.diff b/science/osmocore/files/patch-configure.ac.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7da1e2a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 60c177f..c5d1236 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_INIT([libosmocore],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m4_esyscmd([./git-version-gen .tarball-version]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [openbsc@lists.osmocom.org])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_INIT([libosmocore],[m4_esyscmd(./git-version-gen .tarball-version)],[openbsc@lists.osmocom.org])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl *This* is the root dir, even if an install-sh exists in ../ or ../../
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CONFIG_AUX_DIR([.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -318,8 +316,7 @@ dnl Check if the compiler supports runtime SIMD detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_BUILTIN_SUPPORT([__builtin_cpu_supports],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [Runtime SIMD detection will be disabled])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_OUTPUT(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libosmocore.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CONFIG_FILES([libosmocore.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libosmocodec.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libosmocoding.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libosmovty.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -346,4 +343,5 @@ AC_OUTPUT(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Doxyfile.codec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Doxyfile.coding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Doxyfile.gb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Makefile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Makefile])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_OUTPUT
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix-python.diff b/science/osmocore/files/patch-fix-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index babb9a0..976e885 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-fix-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/include/Makefile.am b/include/Makefile.am
</span> index f95d90c..b5b0341 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -160,7 +160,7 @@ osmocom/core/crc%gen.h: osmocom/core/crcXXgen.h.tpl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,7 +161,7 @@ osmocom/core/crc%gen.h: osmocom/core/crcXXgen.h.tpl
</span> $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@
osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ diff --git a/tests/Makefile.am b/tests/Makefile.am
</span> index 5dd8e22..3d2a44d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -277,5 +277,5 @@ $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -280,5 +280,5 @@ $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4
</span> mv $@.tmp $@
conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-src_timer_clockgettime.c.diff b/science/osmocore/files/patch-src_timer_clockgettime.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b37f476
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-src_timer_clockgettime.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,136 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 60c177f..ef4620d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,6 +56,12 @@ AC_SUBST(LTLDFLAGS_OSMOCODING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl checks for header files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_HEADER_STDC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h syslog.h ctype.h netinet/tcp.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl check for Mach / Darwin / Mac OS X / macOS specifics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl used in src/timer_clockgettime.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_HEADERS(mach/clock.h mach/mach.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_TYPES([clockid_t], [], [], [[#include <time.h>]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for src/conv.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_FUNC_ALLOCA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/timer_clockgettime.c b/src/timer_clockgettime.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8d9760c..c9f5de0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/timer_clockgettime.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/timer_clockgettime.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,6 +51,105 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <osmocom/core/timer_compat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Hack to allow fakeclock to work on Mach / Darwin / Mac OS X */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(HAVE_MACH_CLOCK_H) && defined(HAVE_MACH_MACH_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/clock.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/mach.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * the following defines are ignored in the replacement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * "clock_gettime" function, but must be defined to unique values that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * are in the clockid_t enum from <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CLOCK_REALTIME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef CLOCK_REALTIME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CLOCK_REALTIME 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CLOCK_REALTIME_COARSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef CLOCK_REALTIME_COARSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CLOCK_REALTIME_COARSE 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CLOCK_MONOTONIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef CLOCK_MONOTONIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CLOCK_MONOTONIC 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CLOCK_MONOTONIC_COARSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef CLOCK_MONOTONIC_COARSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CLOCK_MONOTONIC_COARSE 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CLOCK_MONOTONIC_RAW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef CLOCK_MONOTONIC_RAW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CLOCK_MONOTONIC_RAW 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CLOCK_BOOTTIME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef CLOCK_BOOTTIME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CLOCK_BOOTTIME 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CLOCK_PROCESS_CPUTIME_ID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef CLOCK_PROCESS_CPUTIME_ID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CLOCK_PROCESS_CPUTIME_ID 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CLOCK_THREAD_CPUTIME_ID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef CLOCK_THREAD_CPUTIME_ID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CLOCK_THREAD_CPUTIME_ID 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* define this only if not already */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef HAVE_CLOCKID_T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef int clockid_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int mach_clock_gettime (clockid_t clk_id, struct timespec* tp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kern_return_t ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ clock_serv_t cclock;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_timespec_t mts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = host_get_clock_service (mach_host_self (), CALENDAR_CLOCK, &cclock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ret != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errno = EINVAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = clock_get_time (cclock, &mts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ret != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ goto clock_gettime_out;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tp->tv_sec = mts.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tp->tv_nsec = mts.tv_nsec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++clock_gettime_out:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mach_port_deallocate (mach_task_self (), cclock) != 0 || ret != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errno = EINVAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define USE_CLOCK_GETTIME mach_clock_gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define USE_CLOCK_GETTIME clock_gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*! An internal structure to handle overriden time for each clock type. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct fakeclock {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool override;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,7 +198,7 @@ int osmo_clock_gettime(clockid_t clk_id, struct timespec *tp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct fakeclock* c = clkid_to_fakeclock(clk_id);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!c || !c->override)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return clock_gettime(clk_id, tp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return USE_CLOCK_GETTIME(clk_id, tp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *tp = c->time;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span></pre><pre style='margin:0'>
</pre>