From: Juergen Perlinger <perlinger@ntp.org>
Date: Mon, 14 Oct 2013 19:11:05 +0000 (+0200)
Subject: [Bug 2490] Fixed non-const initializer introduced with [Bug 2250] fix.
X-Git-Tag: NTP_4_2_7P392~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a988ff7d56f93929cacf3f9d70e1e9be807be13d;p=thirdparty%2Fntp.git

[Bug 2490] Fixed non-const initializer introduced with [Bug 2250] fix.

bk: 525c41c9EGoCJcKmmZahnzTZ_NOIHg
---

diff --git a/ChangeLog b/ChangeLog
index e0cd05bca..b4cab0d8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2490] Fixed non-const initializer coming from [Bug 2250] fix.
 (4.2.7p391) 2013/10/12 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2250] Rework of leap second handling machine.
 * [Bug 2419] [rc-nmea] Improve clockstats reporting when receiver sends
diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index a4724ccdd..c2fb501d0 100644
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -1708,13 +1708,13 @@ ctl_putsys(
 #ifdef KERNEL_PLL
 	static struct timex ntx;
 	static u_long ntp_adjtime_time;
-	static const double tscale =
+
+	static const double to_ms =
 # ifdef STA_NANO
-				1e-9;
+	    	1.0e-6; /* nsec to msec */
 # else
-				1e-6;
+		1.0e-3; /* usec to msec */
 # endif
-	static const double to_ms = 1e3 * tscale;
 
 	/*
 	 * CS_K_* variables depend on up-to-date output of ntp_adjtime()