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.

diff --git a/ChangeLog b/ChangeLog
index 3020b9ac232315df362521aeaf85f21cb9926db8..cfe739279dc2df7598e0a9985064248e02d453fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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]

diff --git a/conform/data/sys/mman.h-data b/conform/data/sys/mman.h-data
index 0555fd17718b5cc9990eb4cf5f171613028cad09..3a88684bc5e28966b0b88f1ff0b5d31d828ce021 100644 (file)
--- a/conform/data/sys/mman.h-data
+++ b/conform/data/sys/mman.h-data
@@ -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)

diff --git a/conform/data/sys/stat.h-data b/conform/data/sys/stat.h-data
index 41c3932b69defeefec3fd07f75e5f8ea173f9c33..631daa41b0cebffd200a87a337a3398ca33f2306 100644 (file)
--- a/conform/data/sys/stat.h-data
+++ b/conform/data/sys/stat.h-data
@@ -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

diff --git a/conform/data/sys/types.h-data b/conform/data/sys/types.h-data
index cda19548a7c9bd36ef2e7f8596c6db9d3fa06cf7..36c5efac6318db528716c204e08ea92215be6aa6 100644 (file)
--- a/conform/data/sys/types.h-data
+++ b/conform/data/sys/types.h-data
@@ -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