about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-11-07 04:05:12 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-11-07 04:05:12 +0000
commit45832f74730cec39207be84b5a967a3ca8afb633 (patch)
tree0e6c4190d12c5ceec99bc5f2c93153a88a1c130f
parentfdf689a977fe4d11d61b67e47dc3a2884cec996f (diff)
downloadglibc-45832f74730cec39207be84b5a967a3ca8afb633.tar.gz
glibc-45832f74730cec39207be84b5a967a3ca8afb633.tar.xz
glibc-45832f74730cec39207be84b5a967a3ca8afb633.zip
conformtest: Fix typo in CLK_TCK condition.
-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 0f09cd06c5..6e42f8d349 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 8ed2b4a68d..31d5e7dd53 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