Module Name: src
Committed By: christos
Date: Mon Dec 22 04:21:47 UTC 2014
Modified Files:
src/external/bsd/ntp/dist/ntpd: refclock_gpsdjson.c
Log Message:
avoid shadowing of log2 on some platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c
diff -u src/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c:1.2 src/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c:1.3
--- src/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c:1.2 Fri Dec 19 15:43:17 2014
+++ src/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c Sun Dec 21 23:21:47 2014
@@ -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 @@ process_tpv(
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 @@ process_tpv(
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;
}
/* ------------------------------------------------------------------ */
