conformtest: clean up POSIX expectations for sys/mman.h, sys/stat.h, sys/types.h.

Continuing the series of patches to clean up conformtest expectations
for "POSIX" (1995/6) based on review of the expectations against the
standard, this patch cleans up expectations for sys/mman.h, sys/stat.h
and sys/types.h.  Tested x86_64; no new XFAILs needed.

	* conform/data/sys/mman.h-data [POSIX] (size_t): Do not require
	type.
	[POSIX] (off_t): Likewise.
	* conform/data/sys/stat.h-data (S_IRGRP): Require constant.
	[POSIX] (S_ISBLK): Require macro.
	[POSIX] (S_ISCHR): Likewise.
	[POSIX] (S_ISDIR): Likewise.
	[POSIX] (S_ISFIFO): Likewise.
	[POSIX] (S_ISREG): Likewise.
	[POSIX || XPG3 || XPG4 || UNIX98] (S_TYPEISTMO): Do not list
	optional-macro.
	* conform/data/sys/types.h-data [POSIX] (blkcnt_t): Do not require
	type.
	[POSIX] (time_t): Likewise.
	[POSIX] (timer_t): Likewise.
This commit is contained in:
Joseph Myers 2014-06-11 23:16:23 +00:00
parent 89e435f355
commit e81a4f9a54
4 changed files with 27 additions and 2 deletions

View File

@ -1,3 +1,21 @@
2014-06-11 Joseph Myers <joseph@codesourcery.com>
* conform/data/sys/mman.h-data [POSIX] (size_t): Do not require
type.
[POSIX] (off_t): Likewise.
* conform/data/sys/stat.h-data (S_IRGRP): Require constant.
[POSIX] (S_ISBLK): Require macro.
[POSIX] (S_ISCHR): Likewise.
[POSIX] (S_ISDIR): Likewise.
[POSIX] (S_ISFIFO): Likewise.
[POSIX] (S_ISREG): Likewise.
[POSIX || XPG3 || XPG4 || UNIX98] (S_TYPEISTMO): Do not list
optional-macro.
* conform/data/sys/types.h-data [POSIX] (blkcnt_t): Do not require
type.
[POSIX] (time_t): Likewise.
[POSIX] (timer_t): Likewise.
2014-06-11 Florian Weimer <fweimer@redhat.com>
[BZ #17048]

View File

@ -39,8 +39,10 @@ optional-function int posix_typed_mem_get_info (int, struct posix_typed_mem_info
optional-function int posix_typed_mem_open (const char*, int, int)
# endif
# ifndef POSIX
type size_t
type off_t
# endif
function int mlock (const void*, size_t)
function int mlockall (int)

View File

@ -66,6 +66,7 @@ constant S_IRUSR
constant S_IWUSR
constant S_IXUSR
constant S_IRWXG
constant S_IRGRP
constant S_IWGRP
constant S_IXGRP
constant S_IRWXO
@ -78,12 +79,12 @@ constant S_ISGID
constant S_ISVTX
#endif
#if !defined POSIX
macro S_ISBLK
macro S_ISCHR
macro S_ISDIR
macro S_ISFIFO
macro S_ISREG
#if !defined POSIX
macro S_ISLNK
macro S_ISSOCK
#endif
@ -92,7 +93,9 @@ macro S_ISSOCK
optional-macro S_TYPEISMQ
optional-macro S_TYPEISSEM
optional-macro S_TYPEISSHM
# if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
optional-macro S_TYPEISTMO
# endif
# if defined XOPEN2K8 || defined POSIX2008
constant UTIME_NOW

View File

@ -1,6 +1,6 @@
#if !defined ISO && !defined ISO99 && !defined ISO11
type blkcnt_t
#if !defined POSIX
type blkcnt_t
type blksize_t
type clock_t
type clockid_t
@ -48,8 +48,10 @@ type ssize_t
# if !defined POSIX && !defined POSIX2008
type suseconds_t
# endif
# ifndef POSIX
type time_t
type timer_t
# endif
type uid_t
allow *_t