Update.

	* conform/data/regex.h-data: Allow *_t types.
	* conform/data/pwd.h-data: Likewise.
	* conform/data/sched.h-data: Likewise
	* conform/data/pthread.h-data: Likewise.
	* conform/data/search.h-data: Likewise.

	* misc/search.h: Avoid namespace pollution.

7 files changed, 23 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index d775d23299..029c778e55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 1999-08-25  Ulrich Drepper  <drepper@cygnus.com>
 
+	* conform/data/regex.h-data: Allow *_t types.
+	* conform/data/pwd.h-data: Likewise.
+	* conform/data/sched.h-data: Likewise
+	* conform/data/pthread.h-data: Likewise.
+	* conform/data/search.h-data: Likewise.
+
+	* misc/search.h: Avoid namespace pollution.
+
 	* conform/conformtest.pl (@headers): Add search.h, sched.h, regex.h,
 	pwd.h, and pthread.h.
 	* conform/data/pthread.h-data: New file.
diff --git a/conform/data/pthread.h-data b/conform/data/pthread.h-data
index 63091dbe65..eb0523e6af 100644
--- a/conform/data/pthread.h-data
+++ b/conform/data/pthread.h-data
@@ -131,4 +131,5 @@ allow-header time.h
 
 allow PTHREAD_*
 allow pthread_*
+allow *_t
 #endif
diff --git a/conform/data/pwd.h-data b/conform/data/pwd.h-data
index 1c8c7bea75..bd517b4cc5 100644
--- a/conform/data/pwd.h-data
+++ b/conform/data/pwd.h-data
@@ -20,4 +20,5 @@ function {struct passwd*} getpwent (void)
 funciton void setpwent (void)
 
 allow pw_*
+allow *_t
 #endif
diff --git a/conform/data/regex.h-data b/conform/data/regex.h-data
index b6e7f45032..6edb1af22e 100644
--- a/conform/data/regex.h-data
+++ b/conform/data/regex.h-data
@@ -38,4 +38,5 @@ function void regfree (regex_t*)
 allow REG_*
 allow re_*
 allow rm_*
+allow *_t
 #endif
diff --git a/conform/data/sched.h-data b/conform/data/sched.h-data
index 8194bcb2c2..186efb16d5 100644
--- a/conform/data/sched.h-data
+++ b/conform/data/sched.h-data
@@ -19,4 +19,5 @@ allow-header time.h
 
 allow sched_*
 allow SCHED_*
+allow *_t
 #endif
diff --git a/conform/data/search.h-data b/conform/data/search.h-data
index e7c81d31a7..7da11c97c1 100644
--- a/conform/data/search.h-data
+++ b/conform/data/search.h-data
@@ -25,4 +25,6 @@ function {void*} tdelete (const void*, void**, int(*)(const void*, const void*))
 function {void*} tfind (const void*, void*const*, int(*)(const void*, const void*)) tfind (const void*, void*const*, int(*)(const void*, const void*))
 function {void*} tsearch (const void*, void**, int(*)(const void*, const void*))
 function void twalk (const void*, void (*) (const void*, VISIT, int))
+
+allow *_t
 #endif
diff --git a/misc/search.h b/misc/search.h
index 60edbe54dd..8fb2539cd1 100644
--- a/misc/search.h
+++ b/misc/search.h
@@ -31,12 +31,14 @@ __BEGIN_DECLS
 /* Prototype structure for a linked-list data structure.
    This is the type used by the `insque' and `remque' functions.  */
 
+# ifdef __USE_GNU
 struct qelem
   {
     struct qelem *q_forw;
     struct qelem *q_back;
     char q_data[1];
   };
+# endif
 
 
 /* Insert ELEM into a doubly-linked list, after PREV.  */
@@ -104,8 +106,8 @@ struct hsearch_data
    same time.  */
 extern int hsearch_r __P ((ENTRY __item, ACTION __action, ENTRY **__retval,
 			   struct hsearch_data *__htab));
-extern int hcreate_r __P ((size_t __nel, struct hsearch_data *htab));
-extern void hdestroy_r __P ((struct hsearch_data *htab));
+extern int hcreate_r __P ((size_t __nel, struct hsearch_data *__htab));
+extern void hdestroy_r __P ((struct hsearch_data *__htab));
 #endif
 
 
@@ -126,16 +128,16 @@ VISIT;
 /* Search for an entry matching the given KEY in the tree pointed to
    by *ROOTP and insert a new element if not found.  */
 extern void *tsearch __PMT ((__const void *__key, void **__rootp,
-			     __compar_fn_t compar));
+			     __compar_fn_t __compar));
 
 /* Search for an entry matching the given KEY in the tree pointed to
    by *ROOTP.  If no matching entry is available return NULL.  */
 extern void *tfind __PMT ((__const void *__key, void *__const *__rootp,
-			   __compar_fn_t compar));
+			   __compar_fn_t __compar));
 
 /* Remove the element matching KEY from the tree pointed to by *ROOTP.  */
 extern void *tdelete __PMT ((__const void *__key, void **__rootp,
-			     __compar_fn_t compar));
+			     __compar_fn_t __compar));
 
 #ifndef __ACTION_FN_T
 # define __ACTION_FN_T
@@ -146,7 +148,7 @@ typedef void (*__action_fn_t) __PMT ((__const void *__nodep,
 
 /* Walk through the whole tree and call the ACTION callback for every node
    or leaf.  */
-extern void twalk __PMT ((__const void *__root, __action_fn_t action));
+extern void twalk __PMT ((__const void *__root, __action_fn_t __action));
 
 #ifdef __USE_GNU
 /* Callback type for function to free a tree node.  If the keys are atomic
@@ -154,7 +156,7 @@ extern void twalk __PMT ((__const void *__root, __action_fn_t action));
 typedef void (*__free_fn_t) __PMT ((void *__nodep));
 
 /* Destroy the whole tree, call FREEFCT for each node or leaf.  */
-extern void tdestroy __PMT ((void *__root, __free_fn_t freefct));
+extern void tdestroy __PMT ((void *__root, __free_fn_t __freefct));
 #endif