From owner-freebsd-hackers  Tue Feb  4 18:20:36 1997
Return-Path: <owner-hackers>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id SAA14287
          for hackers-outgoing; Tue, 4 Feb 1997 18:20:36 -0800 (PST)
Received: from logues.rhn.orst.edu (logues.RHN.ORST.EDU [128.193.139.116])
          by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id SAA14273
          for <freebsd-hackers@freebsd.org>; Tue, 4 Feb 1997 18:20:32 -0800 (PST)
Received: from logues.rhn.orst.edu (localhost [127.0.0.1])
          by logues.rhn.orst.edu (8.8.4/8.8.4) with SMTP
	  id SAA06250; Tue, 4 Feb 1997 18:20:20 -0800 (PST)
Message-ID: <32F7EE64.1CFBAE39@engr.orst.edu>
Date: Tue, 04 Feb 1997 18:20:20 -0800
From: Steve Logue <logue@engr.orst.edu>
X-Mailer: Mozilla 3.01Gold (X11; I; FreeBSD 2.2-970201-GAMMA0 i386)
MIME-Version: 1.0
To: stenn@whimsy.udel.edu
CC: Joerg Wunsch <joerg_wunsch@uriah.heep.sax.de>,
        John Hay <jhay@zibbi.mikom.csir.co.za>, freebsd-hackers@freebsd.org
Subject: Re: xntp3-5.89.2 & FreeBSD 2.2-GAMMA won't compile
References: <9702041901.aa26048@whimsy.udel.edu>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-hackers@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

stenn@whimsy.udel.edu wrote:
> 
> It looks like I'll need to add this patch to the sys/timex.h file in the
> xntpd distribution:
> 
> --- timex.h-    Sat Jul 15 04:06:10 1995
> +++ timex.h     Sun Feb  2 02:56:21 1997
> @@ -284,6 +284,17 @@
>  };
>  #ifdef __FreeBSD__
> 
> +/*
> + * sysctl identifiers underneath kern.ntp_pll
> + */
> +#define NTP_PLL_GETTIME        1       /* used by ntp_gettime() */
> +#define NTP_PLL_MAXID  2       /* number of valid ids */
> +
> +#define NTP_PLL_NAMES { \
> +                         { 0, 0 }, \
> +                         { "gettime", CTLTYPE_STRUCT }, \
> +                     }
> +
>  #ifndef KERNEL
>  #include <sys/cdefs.h>
> 
> Is there anything else I should add to the xntpd distribution to make
> life easier for us?
> 
> Harlan

We must have gotten off on the wrong foot here.  XNTPD's timex.h isn't
the problem,  FreeBSD's timex.h is.  The currently shipping timex.h with
xntp will compile when included in ntp_loopfilter.c instead of FreeBSD's
timex.h, unaltered.  

Problems still lye somewhere else with regards to ntpq not working.  I
recompiled with this patch, and #include "../kernel/sys/timex.h" in
ntp_loopfilter.c, but it still isn't talking to ntpq.

Is this business of just magically changing to xntp's timex.h instead of
FBSD's even prudent?