* sysdeps/unix/sysv/linux/adjtime.c (ADJTIME): Use prototype style...

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.

diff --git a/ChangeLog b/ChangeLog
index 5096e3260820c2ca22dc1776eeb0a5c2d76c5873..d5facb0836c8c255ab02237be4759322b5f2e49e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * nscd/Makefile: When using compilers without -fpie support, also

diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c
index 62008f63ca0b67c23f58d7fd4e4f56b6cf39e292..38ef805cd5b10a82e5a79e97297efd1769fd7cfa 100644 (file)
--- a/sysdeps/unix/sysv/linux/adjtime.c
+++ b/sysdeps/unix/sysv/linux/adjtime.c
@@ -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.
 
    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
 
 LINKAGE int
-ADJTIME (itv, otv)
-     const struct TIMEVAL *itv;
-     struct TIMEVAL *otv;
+ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv)
 {
   struct TIMEX tntx;
 

diff --git a/sysdeps/unix/sysv/linux/alpha/adjtime.c b/sysdeps/unix/sysv/linux/alpha/adjtime.c
index f8b272e9ce0417f8ef14f999a9f8d460f7363f04..e206cb4727e318f906be7d60bb26ae577ce2dd52 100644 (file)
--- 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);