Update.

	* conform/conformtest.pl: Implement optional-element.  Define
	$mustprepend{"sched.h"}.

	* conform/data/sched.h-data: Make sporadic scheduler definitions
	optional.

	* pwd/pwd.h: Don't define getpwent_r for XPG.

6 files changed, 59 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index bef8a11e41..5f0f7280ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2001-01-26  Ulrich Drepper  <drepper@redhat.com>
 
+	* conform/conformtest.pl: Implement optional-element.  Define
+	$mustprepend{"sched.h"}.
+
+	* conform/data/sched.h-data: Make sporadic scheduler definitions
+	optional.
+
+	* pwd/pwd.h: Don't define getpwent_r for XPG.
+
 	* io/sys/poll.h: Define nfds_t and use it in poll prototype.
 	* sysdeps/generic/poll.c: Use nfds_t type in function definition.
 	* sysdeps/mach/hurd/poll.c: Likewise.
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index 6ac72af460..a121554d07 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -54,6 +54,7 @@ $CFLAGS{"XOPEN2K"} = "-I. '-D__attribute__(x)=' -D_XOPEN_SOURCE=600";
 
 # Some headers need a bit more attention.
 $mustprepend{'regex.h'} = "#include <sys/types.h>\n";
+$mustprepend{'sched.h'} = "#include <sys/types.h>\n";
 $mustprepend{'wordexp.h'} = "#include <stddef.h>\n";
 
 # Make a hash table from this information.
@@ -341,7 +342,47 @@ while ($#headers >= 0) {
       close (TESTFILE);
 
       compiletest ($fnamebase, "Testing for type of member $member",
-		   "Member \"$member\" does not have the correct type.", $res);
+		   "Member \"$member\" does not have the correct type.",
+		   $res, 0);
+    } elsif (/^optional-element *({([^}]*)}|([^{ ]*)) *({([^}]*)}|([^{ ]*)) *([A-Za-z0-9_]*) *(.*)/) {
+      my($struct) = "$2$3";
+      my($type) = "$5$6";
+      my($member) = "$7";
+      my($rest) = "$8";
+      my($res) = $missing;
+
+      # Remember that this name is allowed.
+      push @allow, $member;
+
+      # Generate a program to test for the availability of this member.
+      open (TESTFILE, ">$fnamebase.c");
+      print TESTFILE "$prepend";
+      print TESTFILE "#include <$h>\n";
+      print TESTFILE "$struct a;\n";
+      print TESTFILE "$struct b;\n";
+      print TESTFILE "extern void xyzzy (__typeof__ (&b.$member), __typeof__ (&a.$member), unsigned);\n";
+      print TESTFILE "void foobarbaz (void) {\n";
+      print TESTFILE "  xyzzy (&a.$member, &b.$member, sizeof (a.$member));\n";
+      print TESTFILE "}\n";
+      close (TESTFILE);
+
+      $res = compiletest ($fnamebase, "Testing for member $member",
+			  "NOT AVAILABLE.", $res, 1);
+
+      if ($res == 0 || $missing != 0) {
+	# Test the types of the members.
+	open (TESTFILE, ">$fnamebase.c");
+	print TESTFILE "$prepend";
+	print TESTFILE "#include <$h>\n";
+	print TESTFILE "$struct a;\n";
+	print TESTFILE "extern $type b$rest;\n";
+	print TESTFILE "extern __typeof__ (a.$member) b;\n";
+	close (TESTFILE);
+
+	compiletest ($fnamebase, "Testing for type of member $member",
+		     "Member \"$member\" does not have the correct type.",
+		     $res, 0);
+      }
     } elsif (/^optional-constant *([a-zA-Z0-9_]*) ([>=<]+) ([A-Za-z0-9_]*)/) {
       my($const) = $1;
       my($op) = $2;
diff --git a/conform/data/netinet/in.h-data b/conform/data/netinet/in.h-data
index 5228cc46f7..edbfaa7a4c 100644
--- a/conform/data/netinet/in.h-data
+++ b/conform/data/netinet/in.h-data
@@ -39,7 +39,7 @@ macro IN6ADDR_LOOPBACK_INIT
 
 type {struct ipv6_mreq}
 
-element {struct ipv6_mreq} {struct int6_addr} ipv6mr_multiaddr
+element {struct ipv6_mreq} {struct in6_addr} ipv6mr_multiaddr
 element {struct ipv6_mreq} {unsigned int} ipv6mr_interface
 
 macro IPPROTO_IP
diff --git a/conform/data/pwd.h-data b/conform/data/pwd.h-data
index bd517b4cc5..1267708b98 100644
--- a/conform/data/pwd.h-data
+++ b/conform/data/pwd.h-data
@@ -17,7 +17,7 @@ function int getpwnam_r (const char*, struct passwd*, char*, size_t, struct pass
 function int getpwuid_r (uid_t, struct passwd*, char*, size_t, struct passwd**)
 function void endpwent (void)
 function {struct passwd*} getpwent (void)
-funciton void setpwent (void)
+function void setpwent (void)
 
 allow pw_*
 allow *_t
diff --git a/conform/data/sched.h-data b/conform/data/sched.h-data
index 4cc11efdc8..d4c5ae72cd 100644
--- a/conform/data/sched.h-data
+++ b/conform/data/sched.h-data
@@ -1,14 +1,14 @@
 #ifndef ISO
 type {struct sched_param}
 element {struct sched_param} int sched_priority
-element {struct sched_param} int sched_ss_low_priority
-element {struct sched_param} {struct timespec} sched_ss_repl_period
-element {struct sched_param} {struct timespec} sched_ss_init_budget
-element {struct sched_param} int sched_ss_max_repl
+optional-element {struct sched_param} int sched_ss_low_priority
+optional-element {struct sched_param} {struct timespec} sched_ss_repl_period
+optional-element {struct sched_param} {struct timespec} sched_ss_init_budget
+optional-element {struct sched_param} int sched_ss_max_repl
 
 constant SCHED_FIFO
 constant SCHED_RR
-constant SCHED_SPORADIC
+optional-constant SCHED_SPORADIC
 constant SCHED_OTHER
 
 function int sched_get_priority_max (int)
diff --git a/pwd/pwd.h b/pwd/pwd.h
index 651b9da63d..7a18e743c3 100644
--- a/pwd/pwd.h
+++ b/pwd/pwd.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,95,96,97,98,99,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -107,7 +107,7 @@ extern struct passwd *getpwnam (__const char *__name) __THROW;
    other reentrant functions so the chances are good this is what the
    POSIX people would choose.  */
 
-# if defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN_EXTENDED
+# if defined __USE_SVID || defined __USE_MISC
 extern int getpwent_r (struct passwd *__restrict __resultbuf,
 		       char *__restrict __buffer, size_t __buflen,
 		       struct passwd **__restrict __result) __THROW;