about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/adjtime.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-02-26 17:17:05 +0000
committerUlrich Drepper <drepper@redhat.com>1998-02-26 17:17:05 +0000
commitef030f7f43b87b4bb553fd33e526f5cda6777c7f (patch)
treeb325fa413a93222995979e9997369252baf67f58 /sysdeps/unix/sysv/linux/adjtime.c
parenta588b67da48d54f30ae101cf5d2e9fb0778f95a4 (diff)
downloadglibc-ef030f7f43b87b4bb553fd33e526f5cda6777c7f.tar.gz
glibc-ef030f7f43b87b4bb553fd33e526f5cda6777c7f.tar.xz
glibc-ef030f7f43b87b4bb553fd33e526f5cda6777c7f.zip
1998-02-24 08:10  H.J. Lu  <hjl@gnu.org>

	* sysdeps/unix/sysv/linux/alpha/bits/signum.h (_NSIG): Changed
	to 64.

	* sysdeps/unix/alpha/sysdep.S (_errno): Add in addition to __errno.

	* sysdeps/alpha/s_fabs.S: Added ".set noat"/".set at".
	* sysdeps/unix/sysv/linux/alpha/wait4.S: Ditto.

	* sysdeps/unix/make-syscalls.sh: Make versioned symbols only
	for shared library.

	* libc.map (adjtime, __adjtimex, adjtimex): Added for GLIBC_2.1.

	* sysdeps/unix/sysv/linux/alpha/Makefile (sysdep_routines):
	Added adjtimex and old_adjtimex.

	* sysdeps/unix/sysv/linux/alpha/syscalls.list (old_adjtimex):
	New.
	(osf_settimeofday, osf_getitimer, osf_setitimer, osf_utimes,
	osf_getrusage, osf_wait4): Added __xxxx symbol for GLIBC_2.0.

	* sysdeps/unix/sysv/linux/alpha/getitimer.S: Make versioned
	symbols only for shared library.
	* sysdeps/unix/sysv/linux/alpha/getrusage.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/gettimeofday.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/select.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/setitimer.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/settimeofday.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/utimes.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/wait4.S: Likewise.

	* sysdeps/unix/sysv/linux/alpha/getitimer.S: Fix ENOSYS branch.
	* sysdeps/unix/sysv/linux/alpha/getrusage.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/gettimeofday.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/select.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/setitimer.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/settimeofday.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/utimes.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/wait4.S: Likewise.

	* sysdeps/unix/sysv/linux/alpha/wait4.S: Check the correct
	rusage pointer.

	* sysdeps/unix/sysv/linux/adjtime.c (TIMEVAL, TIMEX, ADJTIMEX):
	New macros.
	(__adjtime): Use TIMEVAL, TIMEX and ADJTIMEX instead of timeval,
	timex and __adjtimex, respectively.

	* sysdeps/unix/sysv/linux/alpha/adjtime.c: New.

	* sysdeps/unix/sysv/linux/alpha/adjtimex.S: New.
Diffstat (limited to 'sysdeps/unix/sysv/linux/adjtime.c')
-rw-r--r--sysdeps/unix/sysv/linux/adjtime.c38
1 files changed, 30 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c
index 748788c972..7e8d90b71e 100644
--- a/sysdeps/unix/sysv/linux/adjtime.c
+++ b/sysdeps/unix/sysv/linux/adjtime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998 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
@@ -28,16 +28,36 @@
 #define modes mode
 #endif
 
-int
-__adjtime (itv, otv)
-     const struct timeval *itv;
-     struct timeval *otv;
+#ifndef TIMEVAL
+#define TIMEVAL timeval
+#endif
+
+#ifndef TIMEX
+#define TIMEX timex
+#endif
+
+#ifndef ADJTIME
+#define ADJTIME __adjtime
+#endif
+
+#ifndef ADJTIMEX
+#define ADJTIMEX(x) __adjtimex (x)
+#endif
+
+#ifndef LINKAGE
+#define LINKAGE
+#endif
+
+LINKAGE int
+ADJTIME (itv, otv)
+     const struct TIMEVAL *itv;
+     struct TIMEVAL *otv;
 {
-  struct timex tntx;
+  struct TIMEX tntx;
 
   if (itv)
     {
-      struct timeval tmp;
+      struct TIMEVAL tmp;
 
       /* We will do some check here. */
       tmp.tv_sec = itv->tv_sec + itv->tv_usec / 1000000L;
@@ -53,7 +73,7 @@ __adjtime (itv, otv)
   else
     tntx.modes = 0;
 
-  if (__adjtimex (&tntx) < 0) return -1;
+  if (ADJTIMEX (&tntx) < 0) return -1;
 
   if (otv)
     {
@@ -71,4 +91,6 @@ __adjtime (itv, otv)
   return 0;
 }
 
+#ifndef ADJTIME
 weak_alias (__adjtime, adjtime)
+#endif