lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

* sysdeps/unix/sysv/linux/adjtime.c (ADJTIME): Use prototype style definition. * sysdeps/unix/sysv/linux/alpha/adjtime.c (ADJTIME): If __ASSUME_TIMEVAL64, define __adjtime directly rather than via strong_alias.

Browse Source 
2004-10-14  Richard Henderson  <rth@redhat.com>

	* sysdeps/alpha/dl-machine.h (elf_machine_rela,
	elf_machine_rela_relative, elf_machine_lazy_rel): Mark auto
	instead of static.

	* sysdeps/unix/sysv/linux/adjtime.c (ADJTIME): Use prototype
	style definition.
	* sysdeps/unix/sysv/linux/alpha/adjtime.c (ADJTIME): If
	__ASSUME_TIMEVAL64, define __adjtime directly rather than
	via strong_alias.
This commit is contained in:
Richard Henderson
2004-10-15 07:06:56 +00:00
parent c8d941c3d1
commit 6539c1ad6e
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2004-10-14 Richard Henderson <rth@redhat.com>
* sysdeps/alpha/dl-machine.h (elf_machine_rela,
elf_machine_rela_relative, elf_machine_lazy_rel): Mark auto
instead of static.
* sysdeps/unix/sysv/linux/adjtime.c (ADJTIME): Use prototype
style definition.
* sysdeps/unix/sysv/linux/alpha/adjtime.c (ADJTIME): If
__ASSUME_TIMEVAL64, define __adjtime directly rather than
via strong_alias.
2004-10-14 Ulrich Drepper <drepper@redhat.com> 2004-10-14 Ulrich Drepper <drepper@redhat.com>
* nscd/Makefile: When using compilers without -fpie support, also * nscd/Makefile: When using compilers without -fpie support, also

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

@ -1,4 +1,5 @@
/* Copyright (C) 1995, 1996, 1997, 1998, 2002 Free Software Foundation, Inc. /* Copyright (C) 1995, 1996, 1997, 1998, 2002, 2004
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -51,9 +52,7 @@ extern int INTUSE(__adjtimex) (struct timex *__ntx);
#endif #endif
LINKAGE int LINKAGE int
ADJTIME (itv, otv) ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv)
const struct TIMEVAL *itv;
struct TIMEVAL *otv;
{ {
struct TIMEX tntx; struct TIMEX tntx;

13
sysdeps/unix/sysv/linux/alpha/adjtime.c
View File

@ -87,14 +87,15 @@ compat_symbol (libc, __adjtime_tv32, adjtime, GLIBC_2_0);
#define TIMEVAL timeval #define TIMEVAL timeval
#undef TIMEX #undef TIMEX
#define TIMEX timex #define TIMEX timex
#undef ADJTIME
#define ADJTIME __adjtime_tv64
#undef ADJTIMEX #undef ADJTIMEX
#define ADJTIMEX(x) INLINE_SYSCALL (adjtimex, 1, x) #define ADJTIMEX(x) INLINE_SYSCALL (adjtimex, 1, x)
#undef LINKAGE
#define LINKAGE static
LINKAGE int ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv); #undef LINKAGE
#undef ADJTIME
#if !defined __ASSUME_TIMEVAL64
#define LINKAGE static
#define ADJTIME __adjtime_tv64
#endif
#include <sysdeps/unix/sysv/linux/adjtime.c> #include <sysdeps/unix/sysv/linux/adjtime.c>
#include <stdbool.h> #include <stdbool.h>
@ -135,8 +136,6 @@ __adjtime (itv, otv)
return ret; return ret;
} }
#else
strong_alias (__adjtime_tv64, __adjtime);
#endif #endif
versioned_symbol (libc, __adjtime, adjtime, GLIBC_2_1); versioned_symbol (libc, __adjtime, adjtime, GLIBC_2_1);