On 04/11/2017 04:05 AM, Ruediger Meier wrote: > From: Ruediger Meier <ruediger.meier@xxxxxxxxxxx> > > There was one missing ifdef since 336f7c5f. They were both in that 'if' test before 336f7c5f: - if (!(show | set | systohc | hctosys | systz | adjust | getepoch - | setepoch | predict | compare | get)) - show = 1; /* default to show */ But they were defined for all arches then: - /* Set option defaults */ - show = set = systohc = hctosys = systz = adjust = noadjfile = predict = - compare = get = update = FALSE; - getepoch = setepoch = utc = local_opt = directisa = testing = debug = FALSE; I think the old way was a cleaner solution, so in sys-utils/hwclock.h:35: - #ifdef __linux__ getepoch:1, setepoch:1, - #endif Should work? I do not have a way to test it. > > CC: Sami Kerola <kerolasa@xxxxxx> > Signed-off-by: Ruediger Meier <ruediger.meier@xxxxxxxxxxx> > --- > sys-utils/hwclock.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c > index 3875bcc..3e0d6e9 100644 > --- a/sys-utils/hwclock.c > +++ b/sys-utils/hwclock.c > @@ -1520,9 +1520,12 @@ int main(int argc, char **argv) > } > } > > - if (!(ctl.show | ctl.set | ctl.systohc | ctl.hctosys | > - ctl.systz | ctl.adjust | ctl.getepoch | ctl.setepoch | > - ctl.predict | ctl.get)) > + if (!(ctl.show | ctl.set | ctl.systohc | ctl.hctosys > + | ctl.systz | ctl.adjust | ctl.predict | ctl.get > +#ifdef __linux__ > + | ctl.getepoch | ctl.setepoch > +#endif > + )) > ctl.show = 1; /* default to show */ > > #ifdef __linux__ > -- To unsubscribe from this list: send the line "unsubscribe util-linux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
