From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 22 Jun 1999 06:53:31 +0000 (-0000)
Subject: ChangeLog, refclock_palisade.c, refclock_palisade.h, hist.c:
X-Git-Tag: NTP_4_0_94~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6773dc059754c6ee6f34eeb8d3432583729f5a15;p=thirdparty%2Fntp.git

ChangeLog, refclock_palisade.c, refclock_palisade.h, hist.c:
  * ntpd/refclock_palisade.c: Patches from Marc Brett
  * ntpd/refclock_palisade.h: Ditto.
  * util/hist.c: Ditto.

bk: 376f32ebmdEPbr5nASk3R-hin4RphQ
---

diff --git a/ChangeLog b/ChangeLog
index 01a0a3b369..5073f02ddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-06-22  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+	* ntpd/refclock_palisade.c: Patches from Marc Brett
+	* ntpd/refclock_palisade.h: Ditto.
+	* util/hist.c: Ditto.
+
 Tue Jun  1 00:40:04 1999  Harlan Stenn  <stenn@pogo.udel.edu>
 
 	* build: mips-dec-ultrix4.4 hates "set -e"
diff --git a/ntpd/refclock_palisade.c b/ntpd/refclock_palisade.c
index a8b9eaed82..69eb6f7d6c 100644
--- a/ntpd/refclock_palisade.c
+++ b/ntpd/refclock_palisade.c
@@ -201,7 +201,9 @@ palisade_start (
 	pp->io.datalen = 0;
 	pp->io.fd = fd;
 	pp->nstages = PALISADE_SAMPLES;
+#ifndef PALISADE
 	pp->nskeep = PALISADE_SAMPLES * 3 / 5;
+#endif
 
 	if (!io_addclock(&pp->io)) {
 #ifdef DEBUG
diff --git a/ntpd/refclock_palisade.h b/ntpd/refclock_palisade.h
index 192c35b980..fe3db30120 100644
--- a/ntpd/refclock_palisade.h
+++ b/ntpd/refclock_palisade.h
@@ -168,7 +168,6 @@ struct palisade_unit {
  * Function prototypes
  */
 
-#if defined PALISADE
 static	int	palisade_start		P((int, struct peer *));
 static	void	palisade_shutdown	P((int, struct peer *));
 static	void	palisade_receive	P((struct peer *));
@@ -181,19 +180,4 @@ float 		getfloat		P((u_char *));
 double 		getdbl 			P((u_char *));
 short  		getint 			P((u_char *));
 
-#else
-
-static	int	palisade_start		P((int, struct peer *));
-static	void	palisade_shutdown	P((int, struct peer *));
-static	void	palisade_receive	P((struct peer *));
-static	void	palisade_poll		P((int, struct peer *));
-static  void 	palisade_io		P((struct recvbuf *));
-int 		palisade_configure	P((int, struct peer *));
-int 		TSIP_decode		P((struct peer *));
-long		HW_poll			P((struct refclockproc *));
-float		getfloat 		P((u_char *)); 
-double 		getdbl 			P((u_char *));
-short  		getint 			P((u_char *));
-#endif
-
 #endif /* PALISADE_H */
diff --git a/util/hist.c b/util/hist.c
index 866d59d45e..ee4e93ad6a 100644
--- a/util/hist.c
+++ b/util/hist.c
@@ -14,15 +14,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-/*
 #include "ntp_types.h"
-*/
 
 #define NBUF 100001		/* size of basic histogram */
 #define NSRT 20000		/* size of overflow histogram */
 #define NCNT (600 * 1000000)	/* sample interval (us) */
 
-int col(long *, long *);
+int col P((long *, long *));
 
 int
 main(