mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-21 17:04:05 +00:00
620f462e88
Bug 14132 is removal of the old INTDEF/INTUSE system of *_internal aliases as obsoleted by the hidden_proto / hidden_def system. Various cases were cleaned up in 2012, but some remain. This patch removes the use of this mechanism for __adjtimex. Tested for x86_64 that stripped installed shared libraries are unchanged by the patch. [BZ #14132] * sysdeps/unix/sysv/linux/include/sys/timex.h: New file. * sysdeps/unix/sysv/linux/adjtime.c [!ADJTIMEX] (ADJTIMEX): Do not use INTUSE. [!ADJTIMEX] (INTUSE(__adjtimex)): Remove declaration. * sysdeps/unix/sysv/linux/alpha/adjtime.c (__adjtimex_internal): Remove alias. (__adjtimex): Define using libc_hidden_ver. * sysdeps/unix/sysv/linux/ntp_gettime.c (INTUSE(__adjtimex)): Remove declaration. (ntp_gettime): Call __adjtimex directly. * sysdeps/unix/sysv/linux/ntp_gettimex.c (INTUSE(__adjtimex)): Remove declaration. (ntp_gettimex): Call __adjtimex directly. * sysdeps/unix/sysv/linux/syscalls.list (adjtimex): Remove __adjtimex_internal alias.
42 lines
1.1 KiB
C
42 lines
1.1 KiB
C
/* Copyright (C) 1999-2014 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
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#define ntp_gettime ntp_gettime_redirect
|
|
|
|
#include <sys/timex.h>
|
|
|
|
#undef ntp_gettime
|
|
|
|
#ifndef MOD_OFFSET
|
|
# define modes mode
|
|
#endif
|
|
|
|
|
|
int
|
|
ntp_gettime (struct ntptimeval *ntv)
|
|
{
|
|
struct timex tntx;
|
|
int result;
|
|
|
|
tntx.modes = 0;
|
|
result = __adjtimex (&tntx);
|
|
ntv->time = tntx.time;
|
|
ntv->maxerror = tntx.maxerror;
|
|
ntv->esterror = tntx.esterror;
|
|
return result;
|
|
}
|