[gentoo-commits] gentoo-x86 commit in net-misc/ntp/files: ntp-4.2.4_p5-adjtimex.patch

[gentoo-commits] gentoo-x86 commit in net-misc/ntp/files: ntp-4.2.4_p5-adjtimex.patch

[Mike Frysinger (vapier)]

vapier      09/01/10 13:03:43

  Added:                ntp-4.2.4_p5-adjtimex.patch
  Log:
  Fix by me for building on uClibc systems with adjtimex() crap #254030 by Tom Lloyd.
  (Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

Revision  Changes    Path
1.1                  net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch?rev=1.1&content-type=text/plain

Index: ntp-4.2.4_p5-adjtimex.patch
===================================================================
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");
 	}