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

bk: 525c41c9EGoCJcKmmZahnzTZ_NOIHg

diff --git a/ChangeLog b/ChangeLog
index e0cd05bcab64faddcc607a7cf70e1248467371e7..b4cab0d8a912ad2b14d52a30949e8ea8f97119ce 100644 (file)
--- 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 a4724ccdd3a8e744ec3272a3a2a6d80d9d20a186..c2fb501d00cc22710535ba327a3d5dd9fff0e611 100644 (file)
--- 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()