]> granicus.if.org Git - strace/commitdiff
Fix bad merge of solaris patch
authorJohn Hughes <john@Calva.COM>
Tue, 27 Mar 2001 13:57:48 +0000 (13:57 +0000)
committerJohn Hughes <john@Calva.COM>
Tue, 27 Mar 2001 13:57:48 +0000 (13:57 +0000)
ChangeLog
svr4/syscallent.h

index eae2810a3f96305ab3484cac9af6cc8c7dd7c58d..1d8c272c184e79096273fc0426e78d4499176a4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-27  John Hughes <john@Calva.COM>
+
+  * svr4/syscallent.h: ntp_adjtime entry was duplicated on Solaris
+    systems - bad merge of Harald Boehme's patch by me.
+
 2001-03-19  Wichert Akkerman <wakkerma@debian.org>
 
   * linux/mips/syscallent.h: we can't have -1 nargs, change to 0
index 19f177f23a11b8fdc4409a2ee94f6696aad76854..0ffe16b95e03e92ed142e5b1a199c2dfeb5411ac 100644 (file)
        { -1,   TN,     sys_sockconfig,         "sockconfig"    }, /* 247 */
        { -1,   0,      sys_ntp_gettime,        "ntp_gettime"   }, /* 248 */
        { -1,   0,      sys_ntp_adjtime,        "ntp_adjtime"   }, /* 249 */
-       { -1,   0,      sys_ntp_adjtime,        "ntp_adjtime"   }, /* 249 */
        { -1,   0,      printargs,              "lwp_mutex_unlock"      }, /* 250 */
        { -1,   0,      printargs,              "lwp_mutex_trylock"     }, /* 251 */
        { -1,   0,      printargs,              "lwp_mutex_init"        }, /* 252 */