Make <sys/timex.h> compatible with C++

(cherry picked from commit 5b08ac571ff8e94fe96511a532f0d20997de5f52)

diff --git a/ChangeLog b/ChangeLog
index c8b7c0afe9715a95f118a5f488602c800484e895..57df7e31ed7769f29f3280e200c4fcb22d407bd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-20  Andreas Schwab  <schwab@redhat.com>
+
+       * sysdeps/unix/sysv/linux/sys/timex.h: Use __REDIRECT_NTH.
+
 2010-05-12  Andrew Stubbs  <ams@codesourcery.com>
 
        * 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 e10311f70f6a73b602bd0a43d377f975e3b31105..13b94d6f4fb10a6ad2e60e4631d3436f9a3813f5 100644 (file)
--- 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