From a9625ea95fbc73e324630e760cf2805a9378ee5e Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 12 Jan 2010 12:18:08 -0800
Subject: [PATCH] Internal namespace test improvements.

---
 ChangeLog                |  5 +++++
 conform/conformtest.pl   |  4 ++--
 conform/data/time.h-data | 11 ++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e908e34b9d..bb5d715eee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-01-12  Ulrich Drepper  <drepper@redhat.com>
 
+	* conform/conformtest.pl (checknamespace): Implement tag for
+	allow-header.
+	* conform/data/time.h-data: Use allow-header instead of duplicating
+	information.
+
 	* conform/data/time.h-data: Allow sigevent tag.
 
 	* posix/sched.h: Define time_t and pid_t for XPG7.
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index c528127cee..4cf571fc42 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -1057,8 +1057,8 @@ while ($#headers >= 0) {
 	push @allow, $1;
       } elsif (/^typed-constant *([a-zA-Z0-9_]*) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*)?/) {
 	push @allow, 1;
-      } elsif (/^type *({([^}]*)|([a-zA-Z0-9_]*))/) {
-	my($type) = "$2$3";
+      } elsif (/^(type|tag) *({([^}]*)|([a-zA-Z0-9_]*))/) {
+	my($type) = "$3$4";
 
 	# Remember that this name is allowed.
 	if ($type =~ /^struct *(.*)/) {
diff --git a/conform/data/time.h-data b/conform/data/time.h-data
index e2ff298ea7..6f86ed05f4 100644
--- a/conform/data/time.h-data
+++ b/conform/data/time.h-data
@@ -89,12 +89,5 @@ variable {long int} timezone
 #endif
 variable {char*} tzname [2]
 
-allow tm_*
-allow clock_*
-allow timer_*
-allow it_*
-allow tv_*
-allow CLOCK_*
-allow TIMER_*
-allow *_t
-allow sigevent
+allow-header sched.h
+allow-header time.h