Update.

2001-01-25  Ulrich Drepper  <drepper@redhat.com>

	* conform/conformtest.pl: Handle allow-header in secondary headers
	correctly.

	* conform/data/fcntl.h-data: Mark symbols introduced in XPG6 with
	#ifdef.

	* conform/data/netinet/in.h-data: Use correct comment character.
	* conform/data/sys/stat.h-data: Likewise.

diff --git a/ChangeLog b/ChangeLog
index bad6b885c9ef1359f13f409c8aff39f49eb2d853..bec1d82376a5d37d58c45af9773ae675b782b3ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-01-25  Ulrich Drepper  <drepper@redhat.com>
+
+       * conform/conformtest.pl: Handle allow-header in secondary headers
+       correctly.
+
+       * conform/data/fcntl.h-data: Mark symbols introduced in XPG6 with
+       #ifdef.
+
+       * conform/data/netinet/in.h-data: Use correct comment character.
+       * conform/data/sys/stat.h-data: Likewise.
+
 2001-01-25  Jakub Jelinek  <jakub@redhat.com>
 
        * math/tgmath.h (__TGMATH_BINARY_FIRST_REAL_ONLY,

diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index 8dde08c11dd410a1e90b2b5be1710486a8ef02b5..810d2632becbf4dcf0d6274758f5e52e232f1a28 100644 (file)
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -58,7 +58,8 @@ $errors = 0;
 #$dialect = "POSIX";
 #$dialect = "XPG3";
 #$dialect = "XPG4";
-$dialect = "UNIX98";
+#$dialect = "UNIX98";
+$dialect = "XOPEN2K";
 
 
 sub poorfnmatch {
@@ -780,11 +781,11 @@ while ($#headers >= 0) {
        push @allow, $4;
       } elsif (/^macro *([^    ]*)/) {
        push @allow, $1;
-      } elsif (/^allow *(.*)/) {
-       push @allow, $1;
       } elsif (/^allow-header *(.*)/) {
        # XXX We should have a test for recursive dependencies here.
        push @allowheader, $1;
+      } elsif (/^allow *(.*)/) {
+       push @allow, $1;
       }
     }
     close (ALLOW);

diff --git a/conform/data/fcntl.h-data b/conform/data/fcntl.h-data
index 0fbe7d57feb9ab0b7eb9c58ab1d547632d8dbf8d..5771af6bbabc7312f205491924874402598c2233 100644 (file)
--- a/conform/data/fcntl.h-data
+++ b/conform/data/fcntl.h-data
@@ -62,12 +62,14 @@ constant S_ISUID
 constant S_ISGID
 constant S_ISVTX
 
+#ifdef XOPEN2K
 constant POSIX_FADV_NORMAL
 constant POSIX_FADV_SEQUENTIAL
 constant POSIX_FADV_RANDOM
 constant POSIX_FADV_WILLNEED
 constant POSIX_FADV_DONTNEED
 constant POSIX_FADV_NOREUSE
+#endif
 
 type {struct flock}
 
@@ -84,9 +86,11 @@ type pid_t
 function int creat (const char*, mode_t)
 function int fcntl (int, int, ...)
 function int open (const char*, int, ...)
+#ifdef XOPEN2K
 function int posix_fadvise (int, off_t, size_t, int)
 function int posix_fallocate (int, off_t, size_t)
 function int posix_madvise (void*, size_t, int)
+#endif
 
 allow-header sys/stat.h
 allow-header unistd.h

diff --git a/conform/data/netinet/in.h-data b/conform/data/netinet/in.h-data
index ad2dd790b0ee2d04e8ddb780e2bc58dd51772255..b6465aaf71d783938a4c6b812de8a72ca3c4cf30 100644 (file)
--- a/conform/data/netinet/in.h-data
+++ b/conform/data/netinet/in.h-data
@@ -29,12 +29,12 @@ element {struct sockaddr_in6} uint32_t sin6_scope_id
 
 variable {struct in6_addr} in6addr_any
 
-# constant IN6ADDR_ANY_INIT
+// constant IN6ADDR_ANY_INIT
 macro IN6ADDR_ANY_INIT
 
 variable {struct in6_addr} in6addr_loopback
 
-#constant IN6ADDR_LOOPBACK_INIT
+// constant IN6ADDR_LOOPBACK_INIT
 macro IN6ADDR_LOOPBACK_INIT
 
 type {struct ipv6_mreq}

diff --git a/conform/data/sys/stat.h-data b/conform/data/sys/stat.h-data
index afdbd2c8889b65550af28411feb63bc2953bc256..3873284ca45ba33d6a2ce1dfd55f42deb14fab4c 100644 (file)
--- a/conform/data/sys/stat.h-data
+++ b/conform/data/sys/stat.h-data
@@ -57,11 +57,11 @@ macro S_ISFIFO
 macro S_ISREG
 macro S_ISLNK
 
-# How to represent optional tests?
-# macro S_TYPEISMQ
-# macro S_TYPEISSEM
-# macro S_TYPEISSHM
-# macro S_TYPEISTMO
+// How to represent optional tests?
+// macro S_TYPEISMQ
+// macro S_TYPEISSEM
+// macro S_TYPEISSHM
+// macro S_TYPEISTMO
 
 function int chmod (const char*, mode_t)
 function int fchmod (int, mode_t)