From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 7 Mar 2015 01:51:49 +0000 (+0000)
Subject: [Bug 2784] Fix for 2782 uses clock_gettime() instead of get_ostime()
X-Git-Tag: NTP_4_3_7~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e7436b8e72fd7cbb494c35aadb505e5b75b9e06;p=thirdparty%2Fntp.git

[Bug 2784] Fix for 2782 uses clock_gettime() instead of get_ostime()

bk: 54fa59b5p0TnP6on_LD4LajJBiWEeA
---

diff --git a/ChangeLog b/ChangeLog
index f18650867..c004c77f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
 * [Bug 2775] ntp-keygen.c fails to compile under Windows.
 * [Bug 2782] Refactor refclock_shm.c, add memory barrier protection.
 * [Bug 2783] Quiet autoconf warnings about missing AC_LANG_SOURCE.
+* [Bug 2784] Fix for 2782 uses clock_gettime() instead of get_ostime().
 ---
 (4.2.8p1) 2015/02/04 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/ntpd/refclock_shm.c b/ntpd/refclock_shm.c
index 2e37fb0c1..5be0889b3 100644
--- a/ntpd/refclock_shm.c
+++ b/ntpd/refclock_shm.c
@@ -391,7 +391,7 @@ static enum segstat_t shm_query(volatile struct shmTime *shm_in, struct shm_stat
 
     /*@-type@*//* splint is confused about struct timespec */
     shm_stat->tvc.tv_sec = shm_stat->tvc.tv_nsec = 0;
-    clock_gettime(CLOCK_REALTIME, &shm_stat->tvc);
+    get_ostime(&shm_stat->tvc);
 
     /* relying on word access to be atomic here */
     if (shm->valid == 0) {