1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
1998-12-01 09:47 -0500  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* 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.
This commit is contained in:
Ulrich Drepper
1998-12-08 13:31:40 +00:00
parent 5c2a0669c1
commit c3c95a7b02
3 changed files with 97 additions and 35 deletions

View File

@ -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