From bec7805d999296000230342f7a8771bbb4001bf1 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 25 Jan 2001 20:05:55 +0000
Subject: [PATCH] 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.
---
 ChangeLog                      | 11 +++++++++++
 conform/conformtest.pl         |  7 ++++---
 conform/data/fcntl.h-data      |  4 ++++
 conform/data/netinet/in.h-data |  4 ++--
 conform/data/sys/stat.h-data   | 10 +++++-----
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bad6b88..bec1d82 100644
--- 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 8dde08c..810d263 100644
--- 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 0fbe7d5..5771af6 100644
--- 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 ad2dd79..b6465aa 100644
--- 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 afdbd2c..3873284 100644
--- 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)
-- 
2.7.4