From c3c95a7b02ecbd5d155ff164d9f06a0252fa6e91 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 8 Dec 1998 13:31:40 +0000 Subject: Update. 1998-12-01 09:47 -0500 Zack Weinberg * sysdeps/unix/sysv/linux/sys/timex.h: Copy out user-space-relevant definitions from linux/timex.h of kernel 2.1.130 and remove include of kernel header. * sysdeps/unix/sysv/linux/adjtime.c: Remove portability crud. --- sysdeps/unix/sysv/linux/adjtime.c | 41 +++++++-------------------------------- 1 file changed, 7 insertions(+), 34 deletions(-) (limited to 'sysdeps/unix/sysv/linux/adjtime.c') diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c index c294ecd6b0..f7dc371fa6 100644 --- a/sysdeps/unix/sysv/linux/adjtime.c +++ b/sysdeps/unix/sysv/linux/adjtime.c @@ -24,41 +24,16 @@ #define MAX_SEC (INT_MAX / 1000000L - 2) #define MIN_SEC (INT_MIN / 1000000L + 2) -#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; +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; @@ -74,7 +49,7 @@ ADJTIME (itv, otv) else tntx.modes = 0; - if (ADJTIMEX (&tntx) < 0) return -1; + if (__adjtimex (&tntx) < 0) return -1; if (otv) { @@ -92,6 +67,4 @@ ADJTIME (itv, otv) return 0; } -#ifdef NO_LOCAL_ADJTIME weak_alias (__adjtime, adjtime) -#endif -- cgit v1.2.3