aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-12-10 19:09:07 +0000
committerUlrich Drepper <drepper@redhat.com>1998-12-10 19:09:07 +0000
commita6e3a56af69fe6d0e037e6188fc5e466aa1e9643 (patch)
tree97526814e8587b961af149447f8f13bcdf02df08
parentf2bbe1fda2cd8c17e6ad1070d62b52f244273bfd (diff)
downloadglibc-a6e3a56af69fe6d0e037e6188fc5e466aa1e9643.tar
glibc-a6e3a56af69fe6d0e037e6188fc5e466aa1e9643.tar.gz
glibc-a6e3a56af69fe6d0e037e6188fc5e466aa1e9643.tar.bz2
glibc-a6e3a56af69fe6d0e037e6188fc5e466aa1e9643.zip
Update.
* sysdeps/unix/sysv/linux/adjtime.c: Undo last change.
-rw-r--r--ChangeLog2
-rw-r--r--sysdeps/unix/sysv/linux/adjtime.c42
2 files changed, 37 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 383d9c371f..efab28ee5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
1998-12-10 Ulrich Drepper <drepper@cygnus.com>
+ * sysdeps/unix/sysv/linux/adjtime.c: Undo last change.
+
* posix/PTESTS: Fix typo.
* po/es.po: Update from translation team.
diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c
index f7dc371fa6..20c7cfe0b5 100644
--- a/sysdeps/unix/sysv/linux/adjtime.c
+++ b/sysdeps/unix/sysv/linux/adjtime.c
@@ -24,16 +24,41 @@
#define MAX_SEC (INT_MAX / 1000000L - 2)
#define MIN_SEC (INT_MIN / 1000000L + 2)
-int
-__adjtime (itv, otv)
- const struct timeval *itv;
- struct timeval *otv;
+#ifndef MOD_OFFSET
+#define modes mode
+#endif
+
+#ifndef TIMEVAL
+#define TIMEVAL timeval
+#endif
+
+#ifndef TIMEX
+#define TIMEX timex
+#endif
+
+#ifndef ADJTIME
+#define ADJTIME __adjtime
+#endif
+
+#ifndef ADJTIMEX
+#define NO_LOCAL_ADJTIME
+#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;
@@ -49,7 +74,8 @@ __adjtime (itv, otv)
else
tntx.modes = 0;
- if (__adjtimex (&tntx) < 0) return -1;
+ if (ADJTIMEX (&tntx) < 0)
+ return -1;
if (otv)
{
@@ -67,4 +93,6 @@ __adjtime (itv, otv)
return 0;
}
+#ifdef NO_LOCAL_ADJTIME
weak_alias (__adjtime, adjtime)
+#endif