Update.

	* sysdeps/unix/sysv/linux/ntp_adjtime.c: Removed.  It's an alias
	for adjtimex.
	* sysdeps/unix/sysv/linux/Dist: Add ntp_gettime.c.
	* sysdeps/unix/sysv/linux/Makefile [subdir=time] (sysdep_routines):
	Remove ntp_adjtime.
	* sysdeps/unix/sysv/linux/syscalls.list: Add alias ntp_adjtime to
	adjtimex.
	* sysdeps/unix/sysv/linux/sys/timex.h: Correct prototype for
	ntp_adjtime.

diff --git a/ChangeLog b/ChangeLog
index 4c98e8c..2a281b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 1999-01-07  Ulrich Drepper  <drepper@cygnus.com>
 
+       * sysdeps/unix/sysv/linux/ntp_adjtime.c: Removed.  It's an alias
+       for adjtimex.
+       * sysdeps/unix/sysv/linux/Dist: Add ntp_gettime.c.
+       * sysdeps/unix/sysv/linux/Makefile [subdir=time] (sysdep_routines):
+       Remove ntp_adjtime.
+       * sysdeps/unix/sysv/linux/syscalls.list: Add alias ntp_adjtime to
+       adjtimex.
+       * sysdeps/unix/sysv/linux/sys/timex.h: Correct prototype for
+       ntp_adjtime.
+
        * sysdeps/i386/i686/mempcpy.S: Fix typos.
 
        * sysdeps/i386/i686/memset.S: New file.

diff --git a/manual/time.texi b/manual/time.texi
index 7084e7f..04258b7 100644 (file)
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -1943,12 +1943,10 @@ exceeded the threshold.
 
 @comment sys/timex.h
 @comment GNU
-@deftypefun int ntp_adjtime (int @var{mode}, struct timex *@var{tptr})
+@deftypefun int ntp_adjtime (struct timex *@var{tptr})
 The @code{ntp_adjtime} function sets the structure specified by
 @var{tptr} to current values.  In addition, values passed in @var{tptr}
-can be used to replace existing settings.  Therefore several magic
-values can be passed in @var{mode}.  Setting @var{mode} to zero only
-reads the current state.
+can be used to replace existing settings.
 
 The return value is @code{0} on success and other values on failure.  The
 following @code{errno} error conditions are defined for this function:

diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 7dbd0ef..c6b881d 100644 (file)
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -9,6 +9,7 @@ ldd-rewrite.sed
 lddlibc4.c
 linux_fsinfo.h
 llseek.c
+ntp_gettime.c
 s_pread64.c
 s_pwrite64.c
 siglist.h

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 64baeb1..d6d3525 100644 (file)
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -54,7 +54,7 @@ endif
 ifeq ($(subdir),time)
 sysdep_headers += sys/timex.h
 
-sysdep_routines += ntp_adjtime ntp_gettime
+sysdep_routines += ntp_gettime
 endif
 
 ifeq ($(subdir),socket)

diff --git a/sysdeps/unix/sysv/linux/ntp_adjtime.c b/sysdeps/unix/sysv/linux/ntp_adjtime.c
deleted file mode 100644 (file)
index d9f3ca7..0000000
--- a/sysdeps/unix/sysv/linux/ntp_adjtime.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <sys/timex.h>
-
-#ifndef MOD_OFFSET
-# define modes mode
-#endif
-
-int
-ntp_adjtime (amode, tntx)
-     int amode;
-     struct timex *tntx;
-{
-  /* Relies on the fact that C lib's struct timex corresponds to kernel's
-     struct timex.  Otherwise you'll need a wrapper. */
-  tntx->modes = amode;
-  return __adjtimex (tntx);
-}

diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h
index da1e33e..7e2a475 100644 (file)
--- a/sysdeps/unix/sysv/linux/sys/timex.h
+++ b/sysdeps/unix/sysv/linux/sys/timex.h
@@ -117,7 +117,7 @@ extern int __adjtimex __P ((struct timex *__ntx));
 extern int adjtimex __P ((struct timex *__ntx));
 
 extern int ntp_gettime __P ((struct ntptimeval *__ntv));
-extern int ntp_adjtime __P ((int __amode, struct timex *__tntx));
+extern int ntp_adjtime __P ((struct timex *__tntx));
 
 __END_DECLS
 

diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 9f6afe4..7b8d5cc 100644 (file)
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -1,6 +1,6 @@
 # File name    Caller  Syscall name    # args  Strong name     Weak names
 
-adjtimex       adjtime adjtimex        1       __adjtimex      adjtimex
+adjtimex       adjtime adjtimex        1       __adjtimex      adjtimex ntp_adjtime
 bdflush                EXTRA   bdflush         2       bdflush
 capget         EXTRA   capget          2       capget
 capset         EXTRA   capset          2       capset