Update.

	* conform/conformtest.pl: Implement optional-constant.
	* conform/data/unistd.h-data: Use optional-constant wherever
	appropriate.

1 files changed, 75 insertions, 75 deletions

diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data
index 70f598b..de880d3 100644
--- a/conform/data/unistd.h-data
+++ b/conform/data/unistd.h-data
@@ -1,92 +1,92 @@
-constant _POSIX_VERSION
-constant _POSIX2_C_VERSION
-constant _XOPEN_VERSION
-constant _XOPEN_XCU_VERSION
+optional-constant _POSIX_VERSION
+optional-constant _POSIX2_C_VERSION
+optional-constant _XOPEN_VERSION
+optional-constant _XOPEN_XCU_VERSION
 
-constant _POSIX2_C_BIND
-constant _POSIX2_CHAR_TERM
-constant _POSIX2_LOCALEDEF
-constant _POSIX2_UPE
-constant _POSIX2_VERSION
+optional-constant _POSIX2_C_BIND
+optional-constant _POSIX2_CHAR_TERM
+optional-constant _POSIX2_LOCALEDEF
+optional-constant _POSIX2_UPE
+optional-constant _POSIX2_VERSION
 
-constant _XOPEN_XPG2
-constant _XOPEN_XPG3
-constant _XOPEN_XPG4
-constant _XOPEN_UNIX
+optional-constant _XOPEN_XPG2
+optional-constant _XOPEN_XPG3
+optional-constant _XOPEN_XPG4
+optional-constant _XOPEN_UNIX
 
-constant _POSIX_ADVISORY_INFO
-constant _POSIX_ASYNCHRONOUS_IO
-constant _POSIX_BARRIERS
-constant _POSIX_CHOWN_RESTRICTED
-constant _POSIX_CLOCK_SELECTION
-constant _POSIX_CPUTIME
-constant _POSIX_NO_TRUNC
-constant _POSIX_VDISABLE
-constant _POSIX_SAVED_IDS
-constant _POSIX_JOB_CONTROL
-constant _POSIX_MONOTONIC_CLOCK
-constant _POSIX_READER_WRITER_LOCKS
-constant _POSIX_SHELL
-constant _POSIX_SPAWN
-constant _POSIX_SPIN_LOCKS
-constant _POSIX_SPORADIC_SERVER
-constant _POSIX_THREAD_CPUTIME
-constant _POSIX_TYPED_MEMORY_OBJECTS
+optional-constant _POSIX_ADVISORY_INFO
+optional-constant _POSIX_ASYNCHRONOUS_IO
+optional-constant _POSIX_BARRIERS
+optional-constant _POSIX_CHOWN_RESTRICTED
+optional-constant _POSIX_CLOCK_SELECTION
+optional-constant _POSIX_CPUTIME
+optional-constant _POSIX_NO_TRUNC
+optional-constant _POSIX_VDISABLE
+optional-constant _POSIX_SAVED_IDS
+optional-constant _POSIX_JOB_CONTROL
+optional-constant _POSIX_MONOTONIC_CLOCK
+optional-constant _POSIX_READER_WRITER_LOCKS
+optional-constant _POSIX_SHELL
+optional-constant _POSIX_SPAWN
+optional-constant _POSIX_SPIN_LOCKS
+optional-constant _POSIX_SPORADIC_SERVER
+optional-constant _POSIX_THREAD_CPUTIME
+optional-constant _POSIX_TYPED_MEMORY_OBJECTS
 
-constant _POSIX_THREADS
-constant _POSIX_THREAD_ATTR_STACKADDR
-constant _POSIX_THREAD_ATTR_STACKSIZE
-constant _POSIX_THREAD_PROCESS_SHARED
-constant _POSIX_THREAD_SAFE_FUNCTIONS
-constant _POSIX_THREAD_SPORADIC_SERVER
+optional-constant _POSIX_THREADS
+optional-constant _POSIX_THREAD_ATTR_STACKADDR
+optional-constant _POSIX_THREAD_ATTR_STACKSIZE
+optional-constant _POSIX_THREAD_PROCESS_SHARED
+optional-constant _POSIX_THREAD_SAFE_FUNCTIONS
+optional-constant _POSIX_THREAD_SPORADIC_SERVER
 
-constant _POSIX2_C_DEV
-constant _POSIX2_FORT_DEV
-constant _POSIX2_FORT_RUN
-constant _POSIX2_SW_DEV
-constant _XOPEN_CRYPT
-constant _XOPEN_ENH_I18N
-constant _XOPEN_LEGACY
-constant _XOPEN_REALTIME
-constant _XOPEN_REALTIME_THREADS
-constant _XOPEN_SHM
-constant _XOPEN_STREAMS
+optional-constant _POSIX2_C_DEV
+optional-constant _POSIX2_FORT_DEV
+optional-constant _POSIX2_FORT_RUN
+optional-constant _POSIX2_SW_DEV
+optional-constant _XOPEN_CRYPT
+optional-constant _XOPEN_ENH_I18N
+optional-constant _XOPEN_LEGACY
+optional-constant _XOPEN_REALTIME
+optional-constant _XOPEN_REALTIME_THREADS
+optional-constant _XOPEN_SHM
+optional-constant _XOPEN_STREAMS
 allow _XBS5_ILP32_OFF32
 allow _XBS5_ILP32_OFBIG
 allow _XBS5_LP64_OFF64
 allow _XBS5_LPBIG_OFFBIG
-constant _POSIX_ASYNCHRONOUS_IO
-constant _POSIX_MEMLOCK
-constant _POSIX_MEMLOCK_RANGE
-constant _POSIX_MESSAGE_PASSING
-constant _POSIX_PRIORITY_SCHEDULING
-constant _POSIX_REALTIME_SIGNALS
-constant _POSIX_SEMAPHORES
-constant _POSIX_SHARED_MEMORY_OBJECTS
-constant _POSIX_SYNCHRONIZED_IO
-constant _POSIX_TIMERS
-constant _POSIX_TIMEOUTS
+optional-constant _POSIX_ASYNCHRONOUS_IO
+optional-constant _POSIX_MEMLOCK
+optional-constant _POSIX_MEMLOCK_RANGE
+optional-constant _POSIX_MESSAGE_PASSING
+optional-constant _POSIX_PRIORITY_SCHEDULING
+optional-constant _POSIX_REALTIME_SIGNALS
+optional-constant _POSIX_SEMAPHORES
+optional-constant _POSIX_SHARED_MEMORY_OBJECTS
+optional-constant _POSIX_SYNCHRONIZED_IO
+optional-constant _POSIX_TIMERS
+optional-constant _POSIX_TIMEOUTS
 
-constant _POSIX_FSYNC
-constant _POSIX_MAPPED_FILES
-constant _POSIX_MEMORY_PROTECTION
+optional-constant _POSIX_FSYNC
+optional-constant _POSIX_MAPPED_FILES
+optional-constant _POSIX_MEMORY_PROTECTION
 
-constant _POSIX_PRIORITIZED_IO
+optional-constant _POSIX_PRIORITIZED_IO
 
-constant _POSIX_THREAD_PRIORITY_SCHEDULING
-constant _POSIX_THREAD_PRIO_INHERIT
-constant _POSIX_THREAD_PRIO_PROTECT
+optional-constant _POSIX_THREAD_PRIORITY_SCHEDULING
+optional-constant _POSIX_THREAD_PRIO_INHERIT
+optional-constant _POSIX_THREAD_PRIO_PROTECT
 
-constant _POSIX_ASYNC_IO
-constant _POSIX_PRIO_IO
-constant _POSIX_SYNC_IO
+optional-constant _POSIX_ASYNC_IO
+optional-constant _POSIX_PRIO_IO
+optional-constant _POSIX_SYNC_IO
 
-constant _POSIX2_PBS
-constant _POSIX2_PBS_ACCOUNTING
-constant _POSIX2_PBS_CHECKPOINT
-constant _POSIX2_PBS_LOCATE
-constant _POSIX2_PBS_MESSAGE
-constant _POSIX2_PBS_TRACK
+optional-constant _POSIX2_PBS
+optional-constant _POSIX2_PBS_ACCOUNTING
+optional-constant _POSIX2_PBS_CHECKPOINT
+optional-constant _POSIX2_PBS_LOCATE
+optional-constant _POSIX2_PBS_MESSAGE
+optional-constant _POSIX2_PBS_TRACK
 
 constant NULL