From 269f8e906b4676d8507b1760192008ebe762e12e Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 21 May 2010 11:45:17 -0700 Subject: [PATCH] Make compatible with C++ (cherry picked from commit 5b08ac571ff8e94fe96511a532f0d20997de5f52) --- ChangeLog | 4 ++++ sysdeps/unix/sysv/linux/sys/timex.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8b7c0afe97..57df7e31ed7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-05-20 Andreas Schwab + + * sysdeps/unix/sysv/linux/sys/timex.h: Use __REDIRECT_NTH. + 2010-05-12 Andrew Stubbs * sysdeps/sh/sh4/fpu/feholdexcpt.c (feholdexcept): Really disable all diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h index e10311f70f6..13b94d6f4fb 100644 --- a/sysdeps/unix/sysv/linux/sys/timex.h +++ b/sysdeps/unix/sysv/linux/sys/timex.h @@ -140,9 +140,9 @@ __BEGIN_DECLS extern int __adjtimex (struct timex *__ntx) __THROW; extern int adjtimex (struct timex *__ntx) __THROW; -#if defined __GNUC__ && __GNUC__ >= 2 -extern int ntp_gettime (struct ntptimeval *__ntv) - __asm__ ("ntp_gettimex") __THROW; +#ifdef __REDIRECT_NTH +extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv), + ntp_gettimex); #else extern int ntp_gettimex (struct ntptimeval *__ntv) __THROW; # define ntp_gettime ntp_gettimex -- 2.47.2