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 01a0a3b3691ceb8fa986d9163dfac0f3043a8264..5073f02ddf5f23864741e955ce78077c9093b128 100644 (file)
--- 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 a8b9eaed82c7bb3ad514d12c98c8e3de5ef10809..69eb6f7d6caa2dbcbc4a74ab5deb8805b88e8fcd 100644 (file)
--- 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 192c35b9809f6893896b86dee301aff6cc3dc5fd..fe3db301207adb37f436b31457e841fc5ec19331 100644 (file)
--- 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 866d59d45e70a9c9019bdaf691a3497c298bbf29..ee4e93ad6a271a45e4a479136f8103ef64af6d9d 100644 (file)
--- 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(