Merge whimsy:/backroom/ntp-dev

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

bk: 459c2574NDBNW0vwpNJvTWF9SyBUXA

diff --cc ntpd/refclock_chu.c
index b3bdb93eee3165a597a93ca67ebecc2379ddc573,5cc5730a9b416b1be1daec529da87ee9f816b318..c9b18df0a3c827f24e24bc91fab803c47910b9b6
--- 1/ntpd/refclock_chu.c
--- 2/ntpd/refclock_chu.c
+++ b/ntpd/refclock_chu.c
@@@ -383,22 -381,23 +383,22 @@@ static  void    chu_poll        (int, struct peer 
  /*
   * More function prototypes
   */
- static        void    chu_decode      P((struct peer *, int));
- static        void    chu_burst       P((struct peer *));
- static        void    chu_clear       P((struct peer *));
- static        void    chu_a           P((struct peer *, int));
- static        void    chu_b           P((struct peer *, int));
- static        int     chu_dist        P((int, int));
- static        double  chu_major       P((struct peer *));
+ static        void    chu_decode      (struct peer *, int);
+ static        void    chu_burst       (struct peer *);
+ static        void    chu_clear       (struct peer *);
+ static        void    chu_a           (struct peer *, int);
+ static        void    chu_b           (struct peer *, int);
+ static        int     chu_dist        (int, int);
+ static        double  chu_major       (struct peer *);
  #ifdef HAVE_AUDIO
- static        void    chu_rf          P((struct peer *, double));
- static        void    chu_gain        P((struct peer *));
- static        void    chu_audio_receive P((struct recvbuf *rbufp));
 -static        void    chu_uart        (struct surv *, double);
+ static        void    chu_rf          (struct peer *, double);
+ static        void    chu_gain        (struct peer *);
+ static        void    chu_audio_receive (struct recvbuf *rbufp);
  #endif /* HAVE_AUDIO */
  #ifdef ICOM
- static        int     chu_newchan     P((struct peer *, double));
+ static        int     chu_newchan     (struct peer *, double);
  #endif /* ICOM */
- static        void    chu_serial_receive P((struct recvbuf *rbufp));
+ static        void    chu_serial_receive (struct recvbuf *rbufp);
  
  /*
   * Global variables

diff --cc ntpd/refclock_irig.c
Simple merge