Merge bk://www.ntp.org/ntp-dev

into  pogo.udel.edu:/pogo/users/kamboj/new-config-bk-repo

bk: 459c46f7_HVYSKIc1Os52rEGdPuxqw

diff --cc NEWS
index 86ff1117459d5af9cebff35aba2e62cad254c445,7b3d392123a58b4efeb4dfa3247f2a89171868f1..42f608fa69c9e88c5a6ad8721d28449eb2e4d157
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,5 -1,4 +1,6 @@@
 +* ntpdsim no longer needs special command-line options.
 +* New ntp.conf processing code from Sachin Kamboj.
+ * [Bug 756] Require ANSI C (function prototypes).
  * codec (audio) and ICOM changes from Dave Mills.
  \f
  (4.2.4) Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/Makefile.am
Simple merge

diff --cc ntpd/ntpd.c
Simple merge