ntp-dev-4.2.5p235-RC build failure: MOD_NANO not #defined

[James Cloos <cloos@jhcloos.com>]

I get this when trying to build the 235 RC:

make[1]: Entering directory `.../work/ntp-dev-4.2.5p235-RC/ntpd'
if i686-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I. -I..  -I../include -I../lib/isc/include -I../lib/isc/nothreads/include -I../lib/isc/unix/include -I../libopts -I/usr/include  -march=pentium3 -O2 -Wno-error   -Wall -Wcast-qual -Wmissing-prototypes -Wpointer-arith -Wshadow -Winit-self -Wstrict-overflow -Wno-strict-prototypes -MT ntp_loopfilter.o -MD -MP -MF ".deps/ntp_loopfilter.Tpo" -c -o ntp_loopfilter.o ntp_loopfilter.c; \
        then mv -f ".deps/ntp_loopfilter.Tpo" ".deps/ntp_loopfilter.Po"; else rm -f ".deps/ntp_loopfilter.Tpo"; exit 1; fi
ntp_loopfilter.c: In function 'local_clock':
ntp_loopfilter.c:521: error: 'MOD_NANO' undeclared (first use in this function)
ntp_loopfilter.c:521: error: (Each undeclared identifier is reported only once
ntp_loopfilter.c:521: error: for each function it appears in.)
make[1]: *** [ntp_loopfilter.o] Error 1
make[1]: Leaving directory `.../work/ntp-dev-4.2.5p235-RC/ntpd'
make: *** [all] Error 2

In ntp_loopfilter.c, MOD_NANO is protected w/in an #ifdef STA_NANO.

I find STA_NANO #defined in <linux/timex.h>, but I cannot find a
definition for MOD_NANO anywhere.

That said, <linux/timex.h> does #define several MOD_ defines in a block
called /* xntp 3.4 compatibility names */ to match the ADJ_ defines;
it #defines ADJ_NANO, but does not include a MOD_NANO #define in that
compatability block.

Also, my <sys/timex.h> (from glibc-2.10.1) says:

sys/timex.h> /* These definitions from linux/timex.h as of 2.6.30.  */


Should ntp_loopfilter.c be using ADJ_NANO instead of MOD_NANO?

Or should timex.h #define MOD_NANO ADJ_NANO?

All of the additions to linux/timex.h since 2.6.30 then are protected
within an #ifdef __KERNEL__ and would, therefore, make no difference.

(In case it is an lk issue, I've included lkml and (following lkml style)
my best guess at the relevant CCs; in case it is an ntpd issue it is also
sent to the ntp hackers list; I do not know whether the latter list
requires subscription to post....)

-JimC
-- 
James Cloos <cloos@jhcloos.com>         OpenPGP: 1024D/ED7DAEA6