From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 27 Aug 2005 03:04:47 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=040d5328e520fc2001ff5c607ad28f83f7adef18;p=thirdparty%2Fntp.git

Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 430fd84fnSOTlrJXfVIvfkrSFFmHUw
---

040d5328e520fc2001ff5c607ad28f83f7adef18
diff --cc ntpd/ntpd.c
index 3df59bda4b,b03bbfc0f6..a16ba2563a
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@@ -10,12 -10,10 +10,13 @@@
  #include "ntpd.h"
  #include "ntp_io.h"
  #include "ntp_stdlib.h"
+ #include <ntp_random.h>
  
  #ifdef SIM
 -#include "ntpsim.h"
 +# include "ntpsim.h"
 +# include "ntpdsim-opts.h"
 +#else
 +# include "ntpd-opts.h"
  #endif
  
  #ifdef HAVE_UNISTD_H