[src/trunk]: src/external/bsd/ntp/dist/ntpd avoid shadowing of log2 on some p...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8917c7ba5806
branches:  trunk
changeset: 805169:8917c7ba5806
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Dec 22 04:21:47 2014 +0000

description:
avoid shadowing of log2 on some platforms.

diffstat:

 external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 371be33ab210 -r 8917c7ba5806 external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c
--- a/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c    Mon Dec 22 00:07:24 2014 +0000
+++ b/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c    Mon Dec 22 04:21:47 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: refclock_gpsdjson.c,v 1.2 2014/12/19 20:43:17 christos Exp $   */
+/*     $NetBSD: refclock_gpsdjson.c,v 1.3 2014/12/22 04:21:47 christos Exp $   */
 
 /*
  * refclock_gpsdjson.c - clock driver as GPSD JSON client
@@ -856,7 +856,7 @@
        const char * gps_time;
        int          gps_mode;
        double       ept, epp, epx, epy, epv;
-       int          log2;
+       int          xlog2;
 
        gps_mode = (int)json_object_lookup_int_default(
                jctx, 0, "mode", 0);
@@ -922,9 +922,9 @@
        ept = min(ept, epp  );
        ept = min(ept, 0.5  );
        ept = max(ept, 1.0-9);
-       ept = frexp(ept, &log2);
+       ept = frexp(ept, &xlog2);
 
-       peer->precision = log2;
+       peer->precision = xlog2;
 }
 
 /* ------------------------------------------------------------------ */