summary refs log tree commit diff
path: root/conform/data
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-27 05:30:29 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-27 05:30:29 +0000
commitda23829807c8e5f4c5a179a3fa693250f9d7f6c1 (patch)
tree2de0ef3e874f36cd5f1c79cf5821f2ad77bb74b6 /conform/data
parent3eee1304546b2562810efb96d48299bba41a6cbe (diff)
downloadglibc-da23829807c8e5f4c5a179a3fa693250f9d7f6c1.tar.gz
glibc-da23829807c8e5f4c5a179a3fa693250f9d7f6c1.tar.xz
glibc-da23829807c8e5f4c5a179a3fa693250f9d7f6c1.zip
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.
Diffstat (limited to 'conform/data')
-rw-r--r--conform/data/netinet/in.h-data2
-rw-r--r--conform/data/pwd.h-data2
-rw-r--r--conform/data/sched.h-data10
3 files changed, 7 insertions, 7 deletions
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)