]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/glibc/glibc-rh652661.patch
Merge remote-tracking branch 'origin/next' into thirteen
[people/teissler/ipfire-2.x.git] / src / patches / glibc / glibc-rh652661.patch
1 2010-05-20 Andreas Schwab <schwab@redhat.com>
2
3 * sysdeps/unix/sysv/linux/sys/timex.h: Use __REDIRECT_NTH.
4
5 Index: glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/sys/timex.h
6 ===================================================================
7 --- glibc-2.12-2-gc4ccff1.orig/sysdeps/unix/sysv/linux/sys/timex.h
8 +++ glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/sys/timex.h
9 @@ -140,9 +140,9 @@ __BEGIN_DECLS
10 extern int __adjtimex (struct timex *__ntx) __THROW;
11 extern int adjtimex (struct timex *__ntx) __THROW;
12
13 -#if defined __GNUC__ && __GNUC__ >= 2
14 -extern int ntp_gettime (struct ntptimeval *__ntv)
15 - __asm__ ("ntp_gettimex") __THROW;
16 +#ifdef __REDIRECT_NTH
17 +extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv),
18 + ntp_gettimex);
19 #else
20 extern int ntp_gettimex (struct ntptimeval *__ntv) __THROW;
21 # define ntp_gettime ntp_gettimex