aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-07-24 19:43:38 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-07-24 19:43:38 +0000
commitbf9e20711e4f3905b2bbcceab2b339b50c7097dd (patch)
treebc7f9a48685b5b68da241cf637822a97e72a5ad0
parent576338111a83529ba550ad8556d48d51219b8e96 (diff)
downloadglibc-bf9e20711e4f3905b2bbcceab2b339b50c7097dd.zip
glibc-bf9e20711e4f3905b2bbcceab2b339b50c7097dd.tar.gz
glibc-bf9e20711e4f3905b2bbcceab2b339b50c7097dd.tar.bz2
conformtest: Update expectations for time.h.
-rw-r--r--ChangeLog8
-rw-r--r--conform/data/time.h-data6
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f9f0e44..b98741f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-24 Joseph Myers <joseph@codesourcery.com>
+
+ * conform/data/time.h-data (NULL): Use macro-constant. Require
+ equal to 0.
+ (CLOCKS_PER_SEC): Use macro instead of constant. Specify type as
+ clock_t.
+ [ISO11] (TIME_UTC): Use macro-int-constant. Require value > 0.
+
2012-07-23 Thomas Schwinge <thomas@codesourcery.com>
* configure.in <sysdeps resolving>: Correct printing
diff --git a/conform/data/time.h-data b/conform/data/time.h-data
index 0deb6be..8ed2b4a 100644
--- a/conform/data/time.h-data
+++ b/conform/data/time.h-data
@@ -1,8 +1,8 @@
-constant NULL
-constant CLOCKS_PER_SEC
+macro-constant NULL == 0
+macro CLOCKS_PER_SEC {clock_t}
#ifdef ISO11
-macro TIME_UTC
+macro-int-constant TIME_UTC > 0
#endif
#if !defined ISO && !defined ISO99