OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

* sysdeps/unix/sysv/linux/adjtime.c: Undo last change.
This commit is contained in:
Ulrich Drepper 1998-12-10 19:09:07 +00:00
parent f2bbe1fda2
commit a6e3a56af6
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
1998-12-10 Ulrich Drepper <drepper@cygnus.com> 1998-12-10 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/adjtime.c: Undo last change.
* posix/PTESTS: Fix typo. * posix/PTESTS: Fix typo.
* po/es.po: Update from translation team. * po/es.po: Update from translation team.

42
sysdeps/unix/sysv/linux/adjtime.c
View File

@ -24,16 +24,41 @@
#define MAX_SEC (INT_MAX / 1000000L - 2) #define MAX_SEC (INT_MAX / 1000000L - 2)
#define MIN_SEC (INT_MIN / 1000000L + 2) #define MIN_SEC (INT_MIN / 1000000L + 2)
int #ifndef MOD_OFFSET
__adjtime (itv, otv) #define modes mode
const struct timeval *itv; #endif
struct timeval *otv;
#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) if (itv)
{ {
struct timeval tmp; struct TIMEVAL tmp;
/* We will do some check here. */ /* We will do some check here. */
tmp.tv_sec = itv->tv_sec + itv->tv_usec / 1000000L; tmp.tv_sec = itv->tv_sec + itv->tv_usec / 1000000L;
@ -49,7 +74,8 @@ __adjtime (itv, otv)
else else
tntx.modes = 0; tntx.modes = 0;
if (__adjtimex (&tntx) < 0) return -1; if (ADJTIMEX (&tntx) < 0)
return -1;
if (otv) if (otv)
{ {
@ -67,4 +93,6 @@ __adjtime (itv, otv)
return 0; return 0;
} }
#ifdef NO_LOCAL_ADJTIME
weak_alias (__adjtime, adjtime) weak_alias (__adjtime, adjtime)
#endif