conformtest: Update expectations for time.h.

diff --git a/ChangeLog b/ChangeLog
index f9f0e44..b98741f 100644 (file)
--- 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 (file)
--- 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