aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-01-07 23:48:59 +0000
committerUlrich Drepper <drepper@redhat.com>1999-01-07 23:48:59 +0000
commitfc4157daf55dc41131e71c6149fbdc4099cb9b57 (patch)
treedcb4956b25603d69dbf11a91f6ac6fbcc2b7a703 /sysdeps/unix
parent6923133b1099c762e381191480d1d87ef00faf38 (diff)
downloadglibc-fc4157daf55dc41131e71c6149fbdc4099cb9b57.tar
glibc-fc4157daf55dc41131e71c6149fbdc4099cb9b57.tar.gz
glibc-fc4157daf55dc41131e71c6149fbdc4099cb9b57.tar.bz2
glibc-fc4157daf55dc41131e71c6149fbdc4099cb9b57.zip
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.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/Dist1
-rw-r--r--sysdeps/unix/sysv/linux/Makefile2
-rw-r--r--sysdeps/unix/sysv/linux/ntp_adjtime.c34
-rw-r--r--sysdeps/unix/sysv/linux/sys/timex.h2
-rw-r--r--sysdeps/unix/sysv/linux/syscalls.list2
5 files changed, 4 insertions, 37 deletions
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 7dbd0ef841..c6b881d2b3 100644
--- 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 64baeb10d6..d6d3525c58 100644
--- 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
index d9f3ca7b9c..0000000000
--- 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 da1e33e85a..7e2a475128 100644
--- 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 9f6afe408c..7b8d5ccb7b 100644
--- 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