5 files changed, 34 insertions, 34 deletions
diff --git a/conform/data/float.h-data b/conform/data/float.h-data
index 71b7ed3c6c..71a429b0bf 100644
--- a/conform/data/float.h-data
+++ b/conform/data/float.h-data
@@ -6,29 +6,29 @@ macro FLT_MANT_DIG
 macro DBL_MANT_DIG
 macro LDBL_MANT_DIG
 
-macro FLT_DIG
-macro DBL_DIG
-macro LDBL_DIG
+constant FLT_DIG >= 6
+constant DBL_DIG >= 10
+constant LDBL_DIG >= 10
 
 macro FLT_MIN_EXP
 macro DBL_MIN_EXP
 macro LDBL_MIN_EXP
 
-macro FLT_MIN_10_EXP
-macro DBL_MIN_10_EXP
-macro LDBL_MIN_10_EXP
+constant FLT_MIN_10_EXP <= -37
+constant DBL_MIN_10_EXP <= -37
+constant LDBL_MIN_10_EXP <= -37
 
 macro FLT_MAX_EXP
 macro DBL_MAX_EXP
 macro LDBL_MAX_EXP
 
-macro FLT_MAX_10_EXP
-macro DBL_MAX_10_EXP
-macro LDBL_MAX_10_EXP
+constant FLT_MAX_10_EXP >= 37
+constant DBL_MAX_10_EXP >= 37
+constant LDBL_MAX_10_EXP >= 37
 
-macro FLT_MAX
-macro DBL_MAX
-macro LDBL_MAX
+constant FLT_MAX >= 1.0E37
+constant DBL_MAX >= 1.0E37
+constant LDBL_MAX >= 1.0E37
 
 macro FLT_EPSILON
 macro DBL_EPSILON
diff --git a/conform/data/netinet/in.h-data b/conform/data/netinet/in.h-data
index 81f1b78cfc..ad2dd790b0 100644
--- a/conform/data/netinet/in.h-data
+++ b/conform/data/netinet/in.h-data
@@ -51,7 +51,7 @@ macro IPPROTO_UDP
 macro INADDR_ANY
 macro INADDR_BROADCAST
 
-macro INET_ADDRSTRLEN
+constant INET_ADDRSTRLEN 16
 
 function uint32_t htonl (uint32_t)
 function uint16_t htons (uint16_t)
@@ -60,7 +60,7 @@ function uint16_t ntohs (uint16_t)
 
 allow-header arpa/inet.h
 
-macro INET6_ADDRSTRLEN
+constant INET6_ADDRSTRLEN 46
 
 macro IPV6_JOIN_GROUP
 macro IPV6_LEAVE_GROUP
diff --git a/conform/data/stdio.h-data b/conform/data/stdio.h-data
index 9299a9ad83..e00ebee68b 100644
--- a/conform/data/stdio.h-data
+++ b/conform/data/stdio.h-data
@@ -1,6 +1,6 @@
 constant BUFSIZ
 constant FILENAME_MAX
-constant FOPEN_MAX
+constant FOPEN_MAX >= 8
 
 constant _IOFBF
 constant _IOLBF
@@ -14,7 +14,7 @@ constant SEEK_CUR
 constant SEEK_END
 constant SEEK_SET
 
-constant TMP_MAX
+constant TMP_MAX >= 10000
 
 constant EOF
 
diff --git a/conform/data/stdlib.h-data b/conform/data/stdlib.h-data
index ce6bc20059..f4998716df 100644
--- a/conform/data/stdlib.h-data
+++ b/conform/data/stdlib.h-data
@@ -1,7 +1,7 @@
 macro EXIT_FAILURE
-macro EXIT_SUCCESS
+constant EXIT_SUCCESS 0
 macro NULL
-macro RAND_MAX
+constant RAND_MAX >= 32767
 macro MB_CUR_MAX
 
 type div_t
diff --git a/conform/data/tar.h-data b/conform/data/tar.h-data
index 79f6fb477a..919167d92b 100644
--- a/conform/data/tar.h-data
+++ b/conform/data/tar.h-data
@@ -1,7 +1,7 @@
-constant TMAGIC
-constant TMAGLEN
-constant TVERSION
-constant TVERSLEN
+macro-str TMAGIC "ustar"
+constant TMAGLEN 6
+macro-str TVERSION "00"
+constant TVERSLEN 2
 
 constant REGTYPE
 constant AREGTYPE
@@ -13,17 +13,17 @@ constant DIRTYPE
 constant FIFOTYPE
 constant CONTTYPE
 
-constant TSUID
-constant TSGID
-constant TSVTX
-constant TUREAD
-constant TUWRITE
-constant TUEXEC
-constant TGREAD
-constant TGWRITE
-constant TGEXEC
-constant TOREAD
-constant TOWRITE
-constant TOEXEC
+constant TSUID 04000
+constant TSGID 02000
+constant TSVTX 01000
+constant TUREAD 00400
+constant TUWRITE 00200
+constant TUEXEC 00100
+constant TGREAD 00040
+constant TGWRITE 00020
+constant TGEXEC 00010
+constant TOREAD 00004
+constant TOWRITE 00002
+constant TOEXEC 00001
 
 allow *_t