ntp: rebase nano patch to apply cleanly
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
f1cdd306e2
commit
cfa6311d2a
@ -3,10 +3,15 @@ http://bugs.gentoo.org/show_bug.cgi?id=270483
|
|||||||
|
|
||||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||||
|
|
||||||
diff -Nura ntp-4.2.6p2.orig/include/ntp_syscall.h ntp-4.2.6p2/include/ntp_syscall.h
|
Rebase to apply cleanly.
|
||||||
--- ntp-4.2.6p2.orig/include/ntp_syscall.h 2009-12-09 04:36:37.000000000 -0300
|
|
||||||
+++ ntp-4.2.6p2/include/ntp_syscall.h 2011-01-27 13:09:05.072336628 -0300
|
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
|
||||||
@@ -14,6 +14,14 @@
|
|
||||||
|
|
||||||
|
diff -purN a/include/ntp_syscall.h b/include/ntp_syscall.h
|
||||||
|
--- a/include/ntp_syscall.h 2015-02-11 08:42:37.794576469 -0500
|
||||||
|
+++ b/include/ntp_syscall.h 2015-02-11 08:43:03.216957279 -0500
|
||||||
|
@@ -10,6 +10,14 @@
|
||||||
# include <sys/timex.h>
|
# include <sys/timex.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -19,5 +24,5 @@ diff -Nura ntp-4.2.6p2.orig/include/ntp_syscall.h ntp-4.2.6p2/include/ntp_syscal
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
#ifndef NTP_SYSCALLS_LIBC
|
#ifndef NTP_SYSCALLS_LIBC
|
||||||
#ifdef NTP_SYSCALLS_STD
|
# ifdef NTP_SYSCALLS_STD
|
||||||
# define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t))
|
# define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t))
|
||||||
|
Loading…
Reference in New Issue
Block a user