diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-07-25 08:19:59 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-07-25 08:19:59 +0000 |
| commit | 51d46f733a26fc9da14cb5d45d88d09e4fc088dd (patch) | |
| tree | b0845ee54f7062089823a7065201145aefbff2ba /sysdeps/unix/sysv/linux | |
| parent | 78ce5a3bbb6ce2ef0c43f5bd575708ff2c7715b9 (diff) | |
| download | glibc-51d46f733a26fc9da14cb5d45d88d09e4fc088dd.tar.gz glibc-51d46f733a26fc9da14cb5d45d88d09e4fc088dd.tar.xz glibc-51d46f733a26fc9da14cb5d45d88d09e4fc088dd.zip | |
Update.
2002-07-25 Ulrich Drepper <drepper@redhat.com> * sysdeps/wordsize-32/divdi3.c: Define __divdi3_internal. * sysdeps/wordsize-32/lldiv.c: Make gcc use __divdi3_internal instead of __divdi3. * sysdeps/unix/sysv/linux/adjtime.c: Use __adjtimex_internal. * sysdeps/unix/sysv/linux/ntp_gettime.c: Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add __adjtimex_internal alias for adjtimex syscall. * elf/dl-minimal.c: Define __assert_fail_internal. * assert/assert.c: Likewise. * include/assert.h: Define __assert_file macro if !SHARED and not NOT_IN_libc. * iconv/Makefile: Define NOT_IN_libc for objects in standalone programs. * locale/Makefile: Likewise. * nscd/Makefile: Likewise. * catgets/Makefile: Likewise. succesful seek call. Simplify error checking.
Diffstat (limited to 'sysdeps/unix/sysv/linux')
| -rw-r--r-- | sysdeps/unix/sysv/linux/adjtime.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ntp_gettime.c | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/syscalls.list | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c index 2066d3fe6c..62008f63ca 100644 --- a/sysdeps/unix/sysv/linux/adjtime.c +++ b/sysdeps/unix/sysv/linux/adjtime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 1998, 2002 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 @@ -42,7 +42,8 @@ #ifndef ADJTIMEX #define NO_LOCAL_ADJTIME -#define ADJTIMEX(x) __adjtimex (x) +#define ADJTIMEX(x) INTUSE(__adjtimex) (x) +extern int INTUSE(__adjtimex) (struct timex *__ntx); #endif #ifndef LINKAGE diff --git a/sysdeps/unix/sysv/linux/ntp_gettime.c b/sysdeps/unix/sysv/linux/ntp_gettime.c index 2bcabbc63f..f78f1682fa 100644 --- a/sysdeps/unix/sysv/linux/ntp_gettime.c +++ b/sysdeps/unix/sysv/linux/ntp_gettime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2002 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 @@ -22,6 +22,10 @@ # define modes mode #endif + +extern int INTUSE(__adjtimex) (struct timex *__ntx); + + int ntp_gettime (ntv) struct ntptimeval *ntv; @@ -30,7 +34,7 @@ ntp_gettime (ntv) int result; tntx.modes = 0; - result = __adjtimex (&tntx); + result = INTUSE(__adjtimex) (&tntx); ntv->time = tntx.time; ntv->maxerror = tntx.maxerror; ntv->esterror = tntx.esterror; diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index c503bbbcd6..efec79ddb1 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -1,6 +1,6 @@ # File name Caller Syscall name Args Strong name Weak names -adjtimex adjtime adjtimex i:p __adjtimex adjtimex ntp_adjtime +adjtimex adjtime adjtimex i:p __adjtimex adjtimex ntp_adjtime __adjtimex_internal bdflush EXTRA bdflush i:ii bdflush capget EXTRA capget i:pp capget capset EXTRA capset i:pp capset |