Fix up <sys/timex.h> a bit more for recent API changes.

diff --git a/ChangeLog b/ChangeLog
index c99965f..dd688b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-22  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/sys/timex.h (MOD_TAI, MOD_MICRO, MOD_NANO):
+       Define.
+       (STA_RONLY): Add STA_NANO, STA_MODE, and STA_CLK.
+
 2009-11-18  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #10162]

diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h
index 5f10c7f..88b87f1 100644 (file)
--- a/sysdeps/unix/sysv/linux/sys/timex.h
+++ b/sysdeps/unix/sysv/linux/sys/timex.h
@@ -85,6 +85,9 @@ struct timex
 #define MOD_TIMECONST  ADJ_TIMECONST
 #define MOD_CLKB       ADJ_TICK
 #define MOD_CLKA       ADJ_OFFSET_SINGLESHOT /* 0x8000 in original */
+#define MOD_TAI                ADJ_TAI
+#define MOD_MICRO      ADJ_MICRO
+#define MOD_NANO       ADJ_NANO
 
 
 /* Status codes (timex.status) */
@@ -108,8 +111,9 @@ struct timex
 #define STA_MODE       0x4000  /* mode (0 = PLL, 1 = FLL) (ro) */
 #define STA_CLK                0x8000  /* clock source (0 = A, 1 = B) (ro) */
 
+/* Read-only bits */
 #define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \
-    STA_PPSERROR | STA_CLOCKERR) /* read-only bits */
+    STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK)
 
 /* Clock states (time_state) */
 #define TIME_OK                0       /* clock synchronized, no leap second */