summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/alpha
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2004-10-15 07:06:56 +0000
committerRichard Henderson <rth@redhat.com>2004-10-15 07:06:56 +0000
commit6539c1ad6e56de46c4a077f701a15d8956754aea (patch)
treeac4888844865dfed59cf6e710291993dce09bb08 /sysdeps/unix/sysv/linux/alpha
parentc8d941c3d1d9d79c09108bf6650c03edaa252abd (diff)
downloadglibc-6539c1ad6e56de46c4a077f701a15d8956754aea.tar.gz
* 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 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.
Diffstat (limited to 'sysdeps/unix/sysv/linux/alpha')
-rw-r--r--sysdeps/unix/sysv/linux/alpha/adjtime.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/adjtime.c b/sysdeps/unix/sysv/linux/alpha/adjtime.c
index f8b272e9ce..e206cb4727 100644
--- a/sysdeps/unix/sysv/linux/alpha/adjtime.c
+++ b/sysdeps/unix/sysv/linux/alpha/adjtime.c
@@ -87,14 +87,15 @@ compat_symbol (libc, __adjtime_tv32, adjtime, GLIBC_2_0);
#define TIMEVAL timeval
#undef TIMEX
#define TIMEX timex
-#undef ADJTIME
-#define ADJTIME __adjtime_tv64
#undef ADJTIMEX
#define ADJTIMEX(x) INLINE_SYSCALL (adjtimex, 1, x)
+
#undef LINKAGE
+#undef ADJTIME
+#if !defined __ASSUME_TIMEVAL64
#define LINKAGE static
-
-LINKAGE int ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv);
+#define ADJTIME __adjtime_tv64
+#endif
#include <sysdeps/unix/sysv/linux/adjtime.c>
#include <stdbool.h>
@@ -135,8 +136,6 @@ __adjtime (itv, otv)
return ret;
}
-#else
-strong_alias (__adjtime_tv64, __adjtime);
#endif
versioned_symbol (libc, __adjtime, adjtime, GLIBC_2_1);