aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--conform/data/time.h-data2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f09cd0..6e42f8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-07 Joseph Myers <joseph@codesourcery.com>
+
+ * conform/data/time.h-data [!XOPEN21K && !XOPEN2K8 && !POSIX2008]:
+ Change XOPEN21K to XOPEN2K.
+
2012-11-06 Maxim Kuvyrkov <maxim@codesourcery.com>
* string/memmove.c: Use memcpy when possible.
diff --git a/conform/data/time.h-data b/conform/data/time.h-data
index 8ed2b4a..31d5e7d 100644
--- a/conform/data/time.h-data
+++ b/conform/data/time.h-data
@@ -42,7 +42,7 @@ function int timespec_get (struct timespec *, int)
#endif
#if !defined ISO && !defined ISO99 && !defined ISO11
-# if !defined XOPEN21K && !defined XOPEN2K8 && !defined POSIX2008
+# if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
symbol CLK_TCK
# endif
constant CLOCK_PROCESS_CPUTIME_ID