34c56e014f
Bump to version 4.2.6p3 and fix a build failure with external toolchains that use certain glibc versions as point out by speakman on IRC. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
34 lines
670 B
Diff
34 lines
670 B
Diff
https://support.ntp.org/bugs/show_bug.cgi?id=769
|
|
http://bugs.gentoo.org/254030
|
|
|
|
--- ntp/util/tickadj.c
|
|
+++ ntp/util/tickadj.c
|
|
@@ -21,7 +21,8 @@
|
|
# include <unistd.h>
|
|
#endif /* HAVE_UNISTD_H */
|
|
|
|
-#ifdef HAVE___ADJTIMEX /* Linux */
|
|
+/* proper handling here has been moved to upstream ntp bugzilla */
|
|
+#ifdef linux
|
|
|
|
#include <sys/timex.h>
|
|
struct timex txc;
|
|
@@ -91,7 +92,7 @@
|
|
}
|
|
|
|
if (!errflg) {
|
|
- if (__adjtimex(&txc) < 0)
|
|
+ if (adjtimex(&txc) < 0)
|
|
perror("adjtimex");
|
|
else if (!quiet)
|
|
printf("tick = %ld\ntick_adj = %d\n",
|
|
@@ -146,7 +147,7 @@
|
|
#endif
|
|
}
|
|
|
|
- if (__adjtimex(&txc) < 0)
|
|
+ if (adjtimex(&txc) < 0)
|
|
{
|
|
perror("adjtimex");
|
|
}
|