This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-715-g116fc08
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 19 Nov 2012 22:22:12 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-715-g116fc08
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 116fc08a619e16e4bab5aa662e8ffde4c6753af1 (commit)
via a483863fc136e1b066cb7886f0426df5e5dee73e (commit)
via 5ba924e3c7b54408050cbf8024279ce837b54e64 (commit)
via ee663277dc2e2eeab0ed18ebd9de63576661296f (commit)
from 381594c4cf393590c0f4c367a0c249f64b421927 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=116fc08a619e16e4bab5aa662e8ffde4c6753af1
commit 116fc08a619e16e4bab5aa662e8ffde4c6753af1
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Nov 19 22:21:47 2012 +0000
conformtest: Clean up expectations for POSIX for more headers.
diff --git a/ChangeLog b/ChangeLog
index 26a6baf..5ab7adb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,60 @@
2012-11-19 Joseph Myers <joseph@codesourcery.com>
+ * conform/data/errno.h-data [POSIX] (EADDRINUSE): Do not expect.
+ [POSIX] (EADDRNOTAVAIL): Likewise.
+ [POSIX] (EAFNOSUPPORT): Likewise.
+ [POSIX] (EALREADY): Likewise.
+ [POSIX] (ECONNABORTED): Likewise.
+ [POSIX] (ECONNREFUSED): Likewise.
+ [POSIX] (ECONNRESET): Likewise.
+ [POSIX] (EDESTADDRREQ): Likewise.
+ [POSIX] (EDQUOT): Likewise.
+ [POSIX] (EHOSTUNREACH): Likewise.
+ [POSIX] (EIDRM): Likewise.
+ [POSIX] (EISCONN): Likewise.
+ [POSIX] (ELOOP): Likewise.
+ [POSIX] (EMULTIHOP): Likewise.
+ [POSIX] (ENETDOWN): Likewise.
+ [POSIX] (ENETUNREACH): Likewise.
+ [POSIX] (ENOBUFS): Likewise.
+ [POSIX] (ENODATA): Likewise.
+ [POSIX] (ENOLINK): Likewise.
+ [POSIX] (ENOMSG): Likewise.
+ [POSIX] (ENOPROTOOPT): Likewise.
+ [POSIX] (ENOSR): Likewise.
+ [POSIX] (ENOSTR): Likewise.
+ [POSIX] (ENOTCONN): Likewise.
+ [POSIX] (ENOTSOCK): Likewise.
+ [POSIX] (EOPNOTSUPP): Likewise.
+ [POSIX] (EOVERFLOW): Likewise.
+ [POSIX] (EPROTO): Likewise.
+ [POSIX] (EPROTONOSUPPORT): Likewise.
+ [POSIX] (EPROTOTYPE): Likewise.
+ [POSIX] (ESTALE): Likewise.
+ [POSIX] (ETIME): Likewise.
+ [POSIX] (ETXTBSY): Likewise.
+ [POSIX] (EWOULDBLOCK): Likewise.
+ [!ISO && !ISO99 && !ISO11] (E*): Do not allow.
+ * conform/data/fcntl.h-data [POSIX] (SEEK_SET): Allow.
+ [POSIX] (SEEK_CUR): Likewise.
+ [POSIX] (SEEK_END): Likewise.
+ [POSIX || UNIX98] (mode_t): Do not require.
+ [POSIX] (off_t): Likewise.
+ [POSIX] (pid_t): Likewise.
+ [POSIX] (sys/stat.h): Do not allow header.
+ [POSIX] (unistd.h): Likewise.
+ [!ISO && !ISO99 && !ISO11] (timespec): Do not allow.
+ [!ISO && !ISO99 && !ISO11] (tv_nsec): Likewise.
+ [!ISO && !ISO99 && !ISO11] (tv_sec): Likewise.
+ * conform/data/locale.h-data [POSIX] (LC_MESSAGES): Do not
+ require.
+ * conform/data/mqueue.h-data [!ISO && !ISO99 && !ISO11] (struct
+ sigevent): Specify elements.
+ [XOPEN2K8 || POSIX2008] (struct sigevent): Remove duplicate type
+ entry.
+ [!ISO && !ISO99 && !ISO11] (mq_*): Allow.
+ [!ISO && !ISO99 && !ISO11] (MQ_*): Likewise.
+
* conform/data/cpio.h-data [POSIX]: Disable whole file.
* conform/data/glob.h-data [POSIX] (GLOB_NOSYS): Do not expect.
* conform/data/limits.h-data [!ISO && !ISO99 && !ISO11]
diff --git a/conform/data/errno.h-data b/conform/data/errno.h-data
index eaf6c21..12730ba 100644
--- a/conform/data/errno.h-data
+++ b/conform/data/errno.h-data
@@ -10,78 +10,116 @@ allow errno
#if !defined ISO && !defined ISO99 && !defined ISO11
macro-int-constant E2BIG {int} > 0
macro-int-constant EACCES {int} > 0
+# if !defined POSIX
macro-int-constant EADDRINUSE {int} > 0
macro-int-constant EADDRNOTAVAIL {int} > 0
macro-int-constant EAFNOSUPPORT {int} > 0
+# endif
macro-int-constant EAGAIN {int} > 0
+# if !defined POSIX
macro-int-constant EALREADY {int} > 0
+# endif
macro-int-constant EBADF {int} > 0
macro-int-constant EBADMSG {int} > 0
macro-int-constant EBUSY {int} > 0
macro-int-constant ECANCELED {int} > 0
macro-int-constant ECHILD {int} > 0
+# if !defined POSIX
macro-int-constant ECONNABORTED {int} > 0
macro-int-constant ECONNREFUSED {int} > 0
macro-int-constant ECONNRESET {int} > 0
+# endif
macro-int-constant EDEADLK {int} > 0
+# if !defined POSIX
macro-int-constant EDESTADDRREQ {int} > 0
macro-int-constant EDQUOT {int} > 0
+# endif
macro-int-constant EEXIST {int} > 0
macro-int-constant EFAULT {int} > 0
macro-int-constant EFBIG {int} > 0
+# if !defined POSIX
macro-int-constant EHOSTUNREACH {int} > 0
macro-int-constant EIDRM {int} > 0
+# endif
macro-int-constant EINPROGRESS {int} > 0
macro-int-constant EINTR {int} > 0
macro-int-constant EINVAL {int} > 0
macro-int-constant EIO {int} > 0
+# if !defined POSIX
macro-int-constant EISCONN {int} > 0
+# endif
macro-int-constant EISDIR {int} > 0
+# if !defined POSIX
macro-int-constant ELOOP {int} > 0
+# endif
macro-int-constant EMFILE {int} > 0
macro-int-constant EMLINK {int} > 0
macro-int-constant EMSGSIZE {int} > 0
+# if !defined POSIX
macro-int-constant EMULTIHOP {int} > 0
+# endif
macro-int-constant ENAMETOOLONG {int} > 0
+# if !defined POSIX
macro-int-constant ENETDOWN {int} > 0
macro-int-constant ENETUNREACH {int} > 0
+# endif
macro-int-constant ENFILE {int} > 0
+# if !defined POSIX
macro-int-constant ENOBUFS {int} > 0
macro-int-constant ENODATA {int} > 0
+# endif
macro-int-constant ENODEV {int} > 0
macro-int-constant ENOENT {int} > 0
macro-int-constant ENOEXEC {int} > 0
macro-int-constant ENOLCK {int} > 0
+# if !defined POSIX
macro-int-constant ENOLINK {int} > 0
+# endif
macro-int-constant ENOMEM {int} > 0
+# if !defined POSIX
macro-int-constant ENOMSG {int} > 0
macro-int-constant ENOPROTOOPT {int} > 0
+# endif
macro-int-constant ENOSPC {int} > 0
+# if !defined POSIX
macro-int-constant ENOSR {int} > 0
macro-int-constant ENOSTR {int} > 0
+# endif
macro-int-constant ENOSYS {int} > 0
+# if !defined POSIX
macro-int-constant ENOTCONN {int} > 0
+# endif
macro-int-constant ENOTDIR {int} > 0
macro-int-constant ENOTEMPTY {int} > 0
+# if !defined POSIX
macro-int-constant ENOTSOCK {int} > 0
+# endif
macro-int-constant ENOTSUP {int} > 0
macro-int-constant ENOTTY {int} > 0
macro-int-constant ENXIO {int} > 0
+# if !defined POSIX
macro-int-constant EOPNOTSUPP {int} > 0
macro-int-constant EOVERFLOW {int} > 0
+# endif
macro-int-constant EPERM {int} > 0
macro-int-constant EPIPE {int} > 0
+# if !defined POSIX
macro-int-constant EPROTO {int} > 0
macro-int-constant EPROTONOSUPPORT {int} > 0
macro-int-constant EPROTOTYPE {int} > 0
+# endif
macro-int-constant EROFS {int} > 0
macro-int-constant ESPIPE {int} > 0
macro-int-constant ESRCH {int} > 0
+# if !defined POSIX
macro-int-constant ESTALE {int} > 0
macro-int-constant ETIME {int} > 0
+# endif
macro-int-constant ETIMEDOUT {int} > 0
+# if !defined POSIX
macro-int-constant ETXTBSY {int} > 0
macro-int-constant EWOULDBLOCK {int} > 0
+# endif
macro-int-constant EXDEV {int} > 0
# if defined XOPEN2K8 || defined POSIX2008
@@ -89,7 +127,6 @@ macro-int-constant ENOTRECOVERABLE {int} > 0
macro-int-constant EOWNERDEAD {int} > 0
# endif
-allow E*
allow *_t
#endif
diff --git a/conform/data/fcntl.h-data b/conform/data/fcntl.h-data
index 6fda308..efe134e 100644
--- a/conform/data/fcntl.h-data
+++ b/conform/data/fcntl.h-data
@@ -18,7 +18,11 @@ constant F_RDLCK
constant F_UNLCK
constant F_WRLCK
-#if !defined POSIX
+#if defined POSIX
+allow SEEK_SET
+allow SEEK_CUR
+allow SEEK_END
+#else
constant SEEK_SET
constant SEEK_CUR
constant SEEK_END
@@ -89,9 +93,13 @@ element {struct flock} off_t l_start
element {struct flock} off_t l_len
element {struct flock} pid_t l_pid
+#if !defined POSIX
+# if !defined UNIX98
type mode_t
+# endif
type off_t
type pid_t
+#endif
function int creat (const char*, mode_t)
function int fcntl (int, int, ...)
@@ -121,16 +129,14 @@ constant AT_REMOVEDIR
function int openat(int, const char*, int, ...)
#endif
+#if !defined POSIX
allow-header sys/stat.h
allow-header unistd.h
+#endif
allow l_*
allow F_*
allow O_*
allow S_*
allow *_t
-
-allow timespec
-allow tv_nsec
-allow tv_sec
#endif
diff --git a/conform/data/locale.h-data b/conform/data/locale.h-data
index adcd25f..003e6ca 100644
--- a/conform/data/locale.h-data
+++ b/conform/data/locale.h-data
@@ -31,7 +31,7 @@ macro-constant NULL == 0
macro-int-constant LC_ALL
macro-int-constant LC_COLLATE
macro-int-constant LC_CTYPE
-#if !defined ISO && !defined ISO99 && !defined ISO11
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
macro-int-constant LC_MESSAGES
#endif
macro-int-constant LC_MONETARY
diff --git a/conform/data/mqueue.h-data b/conform/data/mqueue.h-data
index d6313b3..2ff2748 100644
--- a/conform/data/mqueue.h-data
+++ b/conform/data/mqueue.h-data
@@ -3,6 +3,11 @@
type mqd_t
type {struct sigevent}
+element {struct sigevent} int sigev_notify
+element {struct sigevent} int sigev_signo
+element {struct sigevent} {union sigval} sigev_value
+element {struct sigevent} {void(*} sigev_notify_function )(union sigval)
+element {struct sigevent} {pthread_attr_t*} sigev_notify_attributes
type {struct mq_attr}
element {struct mq_attr} long mq_flags
@@ -28,7 +33,6 @@ type pthread_attr_t
type size_t
type ssize_t
type {struct timespec}
-type {struct sigevent}
#endif
allow-header fcntl.h
@@ -36,5 +40,7 @@ allow-header signal.h
allow-header sys/types.h
allow-header time.h
+allow mq_*
+allow MQ_*
allow *_t
#endif
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a483863fc136e1b066cb7886f0426df5e5dee73e
commit a483863fc136e1b066cb7886f0426df5e5dee73e
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Nov 19 22:20:44 2012 +0000
conformtest: Clean up expectations for POSIX for various headers.
diff --git a/ChangeLog b/ChangeLog
index 865f359..26a6baf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,109 @@
2012-11-19 Joseph Myers <joseph@codesourcery.com>
+ * conform/data/cpio.h-data [POSIX]: Disable whole file.
+ * conform/data/glob.h-data [POSIX] (GLOB_NOSYS): Do not expect.
+ * conform/data/limits.h-data [!ISO && !ISO99 && !ISO11]
+ (AIO_LIST_MAX): Change to AIO_LISTIO_MAX.
+ [!ISO && !ISO99 && !ISO11] (ATEXT_MAX): Remove.
+ [!ISO && !ISO99 && !ISO11 && !POSIX && !XPG3] (ATEXIT_MAX): Allow.
+ [POSIX || POSIX2008 || XPG3] (IOV_MAX): Do not allow.
+ [POSIX || POSIX2008 || XPG3] (_XOPEN_IOV_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (MQ_PRIO_MAX): Allow.
+ [!ISO && !ISO99 && !ISO11] (RE_DUP_MAX): Remove duplicate entry.
+ [POSIX || XPG3 || XPG4 || UNIX98] (SS_REPL_MAX): Do not allow.
+ [POSIX || XPG3 || XPG4 || UNIX98] (SYMLOOP_MAX): Likewise.
+ [POSIX || XPG3 || XPG4] (FILESIZEBITS): Likewise.
+ [POSIX || XPG3 || XPG4 || UNIX98] (POSIX_ALLOC_SIZE_MIN):
+ Likewise.
+ [POSIX || XPG3 || XPG4 || UNIX98] (POSIX_REC_INCR_XFER_SIZE):
+ Likewise.
+ [POSIX || XPG3 || XPG4 || UNIX98] (POSIX_REC_MAX_XFER_SIZE):
+ Likewise.
+ [POSIX || XPG3 || XPG4 || UNIX98] (POSIX_REC_XFER_ALIGN):
+ Likewise.
+ [POSIX || XPG3 || XPG4 || UNIX98] (SYMLINK_MAX): Likewise.
+ [POSIX || XPG3 || XPG4 || UNIX98] (_POSIX_SS_REPL_MAX): Likewise.
+ [POSIX || XPG3 || XPG4 || UNIX98] (_POSIX_SYMLINK_MAX): Likewise.
+ [POSIX || XPG3 || XPG4 || UNIX98] (_POSIX_SYMLOOP_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (BC_BASE_MAX): Use macro-constant.
+ Specify lower bound on value.
+ [!ISO && !ISO99 && !ISO11] (BC_DIM_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (BC_SCALE_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (BC_STRING_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (COLL_WEIGHTS_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (EXPR_NEST_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (RE_DUP_MAX): Likewise
+ [POSIX || XPG3 || XPG4] (CHARCLASS_NAME_MAX): Do not allow.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_CLOCKRES_MIN): Specify exact
+ value.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_AIO_LISTIO_MAX): Do not specify
+ as optional.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_AIO_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_ARG_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_CHILD_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_DELAYTIMER_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_LINK_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_LOGIN_NAME_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_MAX_CANON): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_MAX_INPUT): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_MQ_OPEN_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_MQ_PRIO_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_NAME_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_NGROUPS_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_OPEN_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_PATH_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_PIPE_BUF): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX2_RE_DUP_MAX): Remove duplicate
+ entry.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_RTSIG_MAX): Do not specify as
+ optional.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_SEM_NSEMS_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_SEM_VALUE_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_SIGQUEUE_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_SSIZE_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_STREAM_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_THREAD_DESTRUCTOR_ITERATIONS):
+ Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_THREAD_KEYS_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_THREAD_THREADS_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_TIMER_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_TTY_NAME_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX_TZNAME_MAX): Likewise. Give
+ value as 3 for [POSIX || XPG3 || XPG4 || UNIX98].
+ [!ISO && !ISO99 && !ISO11] (_POSIX2_BC_BASE_MAX): Do not specify
+ as optional.
+ [!ISO && !ISO99 && !ISO11] (_POSIX2_BC_DIM_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX2_BC_SCALE_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX2_BC_STRING_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX2_CHARCLASS_NAME_MAX):
+ Likewise. Do not allow for [POSIX || XPG3 || XPG4 || UNIX98].
+ [!ISO && !ISO99 && !ISO11] (_POSIX2_COLL_WEIGHTS_MAX): Do not
+ specify as optional.
+ [!ISO && !ISO99 && !ISO11] (_POSIX2_EXPR_NEST_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX2_LINE_MAX): Likewise.
+ [!ISO && !ISO99 && !ISO11] (_POSIX2_RE_DUP_MAX): Likewise.
+ [POSIX || POSIX2008 || XPG3] (_XOPEN_IOV_MAX): Do not allow.
+ [POSIX || XPG3] (NL_ARGMAX): Do not allow.
+ [XPG3] (NL_LANGMAX): Likewise.
+ [POSIX || XPG3] (NL_MSGMAX): Likewise.
+ [POSIX || XPG3] (NL_NMAX): Likewise.
+ [POSIX || XPG3] (NL_SETMAX): Likewise.
+ [POSIX || XPG3] (NL_TEXTMAX): Likewise.
+ [XPG3] (NZERO): Likewise.
+ [XPG4 || UNIX98] (TMP_MAX): Only enable for these conditions.
+ [POSIX || XPG3 || XPG4 || UNIX98] (*_MIN): Do not allow.
+ [!ISO && !ISO99 && !ISO11] (*_t): Allow.
+ * conform/data/regex.h-data [!ISO && !ISO99 && !ISO11]
+ (REG_ERANGE): Expect.
+ * conform/data/stdio.h-data [POSIX] (L_cuserid): Use
+ optional-constant.
+ [POSIX || XOPEN2K || XOPEN2K8 || POSIX2008] (getchar_unlocked):
+ Use (void) in prototype.
+ [POSIX] (*_t): Allow.
+ * conform/data/sys/times.h-data [POSIX]: Enable whole file.
+ * conform/data/wordexp.h-data [!ISO && !ISO99 && !ISO11]
+ (WRDE_BADVAL): Expect.
+
* conform/data/fcntl.h-data [XPG3 || XPG4] (O_DSYNC): Do not
expect.
[XPG3 || XPG4] (O_RSYNC): Likewise.
diff --git a/conform/data/cpio.h-data b/conform/data/cpio.h-data
index 4727770..ac7d40f 100644
--- a/conform/data/cpio.h-data
+++ b/conform/data/cpio.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
constant C_IRUSR == 0000400
constant C_IWUSR == 0000200
constant C_IXUSR == 0000100
diff --git a/conform/data/glob.h-data b/conform/data/glob.h-data
index fc2c7fe..eca8393 100644
--- a/conform/data/glob.h-data
+++ b/conform/data/glob.h-data
@@ -19,7 +19,7 @@ constant GLOB_NOSORT
constant GLOB_ABORTED
constant GLOB_NOMATCH
constant GLOB_NOSPACE
-# if !defined XOPEN2K8 && !defined POSIX2008
+# if !defined XOPEN2K8 && !defined POSIX2008 && !defined POSIX
constant GLOB_NOSYS
# endif
diff --git a/conform/data/limits.h-data b/conform/data/limits.h-data
index dec178a..726db1e 100644
--- a/conform/data/limits.h-data
+++ b/conform/data/limits.h-data
@@ -28,16 +28,21 @@ macro-int-constant ULLONG_MAX {unsigned long long int} >= 18446744073709551615ul
#if !defined ISO && !defined ISO99 && !defined ISO11
// if these values exist, we should check the minimal value
-allow AIO_LIST_MAX
+allow AIO_LISTIO_MAX
allow AIO_MAX
allow AIO_PRIO_DELTA_MAX
allow ARG_MAX
-allow ATEXT_MAX
+#if !defined POSIX && !defined XPG3
+allow ATEXIT_MAX
+#endif
allow CHILD_MAX
allow DELAYTIMER_MAX
+#if !defined POSIX && !defined POSIX2008 && !defined XPG3
allow IOV_MAX
+#endif
allow LOGIN_NAME_MAX
allow MQ_OPEN_MAX
+allow MQ_PRIO_MAX
allow OPEN_MAX
allow PAGESIZE
#if !defined POSIX && !defined POSIX2008
@@ -47,98 +52,117 @@ allow PTHREAD_DESTRUCTOR_ITERATIONS
allow PTHREAD_KEYS_MAX
allow PTHREAD_STACK_MIN
allow PTHREAD_THREADS_MAX
-allow RE_DUP_MAX
allow RTSIG_MAX
allow SEM_NSEMS_MAX
allow SEM_VALUE_MAX
allow SIGQUEUE_MAX
+#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
allow SS_REPL_MAX
+#endif
allow STREAM_MAX
+#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
allow SYMLOOP_MAX
+#endif
allow TIMER_MAX
allow TTY_NAME_MAX
allow TZNAME_MAX
+#if !defined POSIX && !defined XPG3 && !defined XPG4
allow FILESIZEBITS
+#endif
allow LINK_MAX
allow MAX_CANON
allow MAX_INPUT
allow NAME_MAX
allow PATH_MAX
allow PIPE_BUF
+#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
allow POSIX_ALLOC_SIZE_MIN
allow POSIX_REC_INCR_XFER_SIZE
allow POSIX_REC_MAX_XFER_SIZE
allow POSIX_REC_XFER_ALIGN
allow SYMLINK_MAX
+#endif
-macro BC_BASE_MAX
-macro BC_DIM_MAX
-macro BC_SCALE_MAX
-macro BC_STRING_MAX
+macro-constant BC_BASE_MAX >= _POSIX2_BC_BASE_MAX
+macro-constant BC_DIM_MAX >= _POSIX2_BC_DIM_MAX
+macro-constant BC_SCALE_MAX >= _POSIX2_BC_SCALE_MAX
+macro-constant BC_STRING_MAX >= _POSIX2_BC_STRING_MAX
+#if !defined POSIX && !defined XPG3 && !defined XPG4
macro CHARCLASS_NAME_MAX
-macro COLL_WEIGHTS_MAX
-macro EXPR_NEST_MAX
-macro LINE_MAX
+#endif
+macro-constant COLL_WEIGHTS_MAX >= _POSIX2_COLL_WEIGHTS_MAX
+macro-constant EXPR_NEST_MAX >= _POSIX2_EXPR_NEST_MAX
+macro-constant LINE_MAX >= _POSIX2_LINE_MAX
constant NGROUPS_MAX >= 8
-macro RE_DUP_MAX
+macro-constant RE_DUP_MAX >= _POSIX2_RE_DUP_MAX
-constant _POSIX_CLOCKRES_MIN <= 20000000
+constant _POSIX_CLOCKRES_MIN == 20000000
-optional-constant _POSIX_AIO_LISTIO_MAX == 2
-optional-constant _POSIX_AIO_MAX == 1
-optional-constant _POSIX_ARG_MAX == 4096
+constant _POSIX_AIO_LISTIO_MAX == 2
+constant _POSIX_AIO_MAX == 1
+constant _POSIX_ARG_MAX == 4096
#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
-optional-constant _POSIX_CHILD_MAX == 25
+constant _POSIX_CHILD_MAX == 25
#else
-optional-constant _POSIX_CHILD_MAX == 6
-#endif
-optional-constant _POSIX_DELAYTIMER_MAX == 32
-optional-constant _POSIX_LINK_MAX == 8
-optional-constant _POSIX_LOGIN_NAME_MAX == 9
-optional-constant _POSIX_MAX_CANON == 255
-optional-constant _POSIX_MAX_INPUT == 255
-optional-constant _POSIX_MQ_OPEN_MAX == 8
-optional-constant _POSIX_MQ_PRIO_MAX == 32
-optional-constant _POSIX_NAME_MAX == 14
+constant _POSIX_CHILD_MAX == 6
+#endif
+constant _POSIX_DELAYTIMER_MAX == 32
+constant _POSIX_LINK_MAX == 8
+constant _POSIX_LOGIN_NAME_MAX == 9
+constant _POSIX_MAX_CANON == 255
+constant _POSIX_MAX_INPUT == 255
+constant _POSIX_MQ_OPEN_MAX == 8
+constant _POSIX_MQ_PRIO_MAX == 32
+constant _POSIX_NAME_MAX == 14
#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
-optional-constant _POSIX_NGROUPS_MAX == 8
+constant _POSIX_NGROUPS_MAX == 8
#else
-optional-constant _POSIX_NGROUPS_MAX == 0
+constant _POSIX_NGROUPS_MAX == 0
#endif
#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
-optional-constant _POSIX_OPEN_MAX == 20
+constant _POSIX_OPEN_MAX == 20
#else
-optional-constant _POSIX_OPEN_MAX == 16
-#endif
-optional-constant _POSIX_PATH_MAX == 256
-optional-constant _POSIX_PIPE_BUF == 512
-optional-constant _POSIX2_RE_DUP_MAX == 255
-optional-constant _POSIX_RTSIG_MAX == 8
-optional-constant _POSIX_SEM_NSEMS_MAX == 256
-optional-constant _POSIX_SEM_VALUE_MAX == 32767
-optional-constant _POSIX_SIGQUEUE_MAX == 32
-optional-constant _POSIX_SSIZE_MAX == 32767
-optional-constant _POSIX_STREAM_MAX == 8
+constant _POSIX_OPEN_MAX == 16
+#endif
+// Value was 255, corrected to 256 following an interpretation request.
+constant _POSIX_PATH_MAX == 256
+constant _POSIX_PIPE_BUF == 512
+constant _POSIX_RTSIG_MAX == 8
+constant _POSIX_SEM_NSEMS_MAX == 256
+constant _POSIX_SEM_VALUE_MAX == 32767
+constant _POSIX_SIGQUEUE_MAX == 32
+constant _POSIX_SSIZE_MAX == 32767
+constant _POSIX_STREAM_MAX == 8
+#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
optional-constant _POSIX_SS_REPL_MAX == 4
optional-constant _POSIX_SYMLINK_MAX == 255
optional-constant _POSIX_SYMLOOP_MAX == 8
-optional-constant _POSIX_THREAD_DESTRUCTOR_ITERATIONS == 4
-optional-constant _POSIX_THREAD_KEYS_MAX == 128
-optional-constant _POSIX_THREAD_THREADS_MAX == 64
-optional-constant _POSIX_TIMER_MAX == 32
-optional-constant _POSIX_TTY_NAME_MAX == 9
-optional-constant _POSIX_TZNAME_MAX == 6
-optional-constant _POSIX2_BC_BASE_MAX == 99
-optional-constant _POSIX2_BC_DIM_MAX == 2048
-optional-constant _POSIX2_BC_SCALE_MAX == 99
-optional-constant _POSIX2_BC_STRING_MAX == 1000
-optional-constant _POSIX2_CHARCLASS_NAME_MAX == 14
-optional-constant _POSIX2_COLL_WEIGHTS_MAX == 2
-optional-constant _POSIX2_EXPR_NEST_MAX == 32
-optional-constant _POSIX2_LINE_MAX == 2048
-optional-constant _POSIX2_RE_DUP_MAX == 255
+#endif
+constant _POSIX_THREAD_DESTRUCTOR_ITERATIONS == 4
+constant _POSIX_THREAD_KEYS_MAX == 128
+constant _POSIX_THREAD_THREADS_MAX == 64
+constant _POSIX_TIMER_MAX == 32
+constant _POSIX_TTY_NAME_MAX == 9
+#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
+constant _POSIX_TZNAME_MAX == 6
+#else
+constant _POSIX_TZNAME_MAX == 3
+#endif
+macro-constant _POSIX2_BC_BASE_MAX == 99
+macro-constant _POSIX2_BC_DIM_MAX == 2048
+macro-constant _POSIX2_BC_SCALE_MAX == 99
+macro-constant _POSIX2_BC_STRING_MAX == 1000
+#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
+constant _POSIX2_CHARCLASS_NAME_MAX == 14
+#endif
+macro-constant _POSIX2_COLL_WEIGHTS_MAX == 2
+macro-constant _POSIX2_EXPR_NEST_MAX == 32
+macro-constant _POSIX2_LINE_MAX == 2048
+macro-constant _POSIX2_RE_DUP_MAX == 255
+#if !defined POSIX && !defined POSIX2008 && !defined XPG3
optional-constant _XOPEN_IOV_MAX == 16
+#endif
#if !defined POSIX && !defined POSIX2008
constant WORD_BIT >= 16
@@ -146,22 +170,31 @@ constant LONG_BIT >= 32
#endif
constant SSIZE_MAX
+#if !defined POSIX && !defined XPG3 && !defined XPG4
optional-constant CHARCLASS_NAME_MAX >= 14
+#endif
+#if !defined POSIX && !defined XPG3
optional-constant NL_ARGMAX >= 9
-#if !defined POSIX && !defined POSIX2008
+# if !defined POSIX2008
optional-constant NL_LANGMAX >= 14
-#endif
+# endif
optional-constant NL_MSGMAX >= 32767
-#if !defined XOPEN2K8 && !defined POSIX2008
+# if !defined XOPEN2K8 && !defined POSIX2008
optional-constant NL_NMAX
-#endif
+# endif
optional-constant NL_SETMAX >= 255
optional-constant NL_TEXTMAX
-#if !defined POSIX && !defined POSIX2008
+# if !defined POSIX2008
optional-constant NZERO >= 20
+# endif
#endif
+#if defined XPG4 || defined UNIX98
optional-constant TMP_MAX >= 10000
+#endif
allow *_MAX
+#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
allow *_MIN
#endif
+allow *_t
+#endif
diff --git a/conform/data/regex.h-data b/conform/data/regex.h-data
index 2822f0b..04f9034 100644
--- a/conform/data/regex.h-data
+++ b/conform/data/regex.h-data
@@ -26,6 +26,7 @@ constant REG_EBRACK
constant REG_EPAREN
constant REG_EBRACE
constant REG_BADBR
+constant REG_ERANGE
constant REG_ESPACE
constant REG_BADRPT
# if !defined POSIX && !defined XOPEN2K8 && !defined POSIX2008
diff --git a/conform/data/stdio.h-data b/conform/data/stdio.h-data
index ab55ce7..9089180 100644
--- a/conform/data/stdio.h-data
+++ b/conform/data/stdio.h-data
@@ -9,7 +9,11 @@ macro-int-constant _IONBF
#if !defined ISO && !defined ISO99 && !defined ISO11
constant L_ctermid
# if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
+# ifdef POSIX
+optional-constant L_cuserid
+# else
constant L_cuserid
+# endif
# endif
#endif
macro-int-constant L_tmpnam
@@ -99,7 +103,7 @@ function int getc (FILE*)
function int getchar (void)
#if defined POSIX || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008
function int getc_unlocked (FILE*)
-function int getchar_unlocked ()
+function int getchar_unlocked (void)
#endif
#if defined XOPEN2K8 || defined POSIX2008
function ssize_t getdelim (char**, size_t*, int, FILE*)
@@ -174,15 +178,17 @@ function int vsprintf (char*, const char*, va_list)
function int vsscanf (const char*, const char*, va_list)
#endif
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
-#if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
+#if !defined ISO && !defined ISO99 && !defined ISO11
+#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
variable {char*} optarg
variable int opterr
variable int optind
variable int optopt
#endif
+#if !defined POSIX
allow-header stddef.h
+#endif
allow *_t
#endif
diff --git a/conform/data/sys/times.h-data b/conform/data/sys/times.h-data
index d10444d..c93357b 100644
--- a/conform/data/sys/times.h-data
+++ b/conform/data/sys/times.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11
type {struct tms}
element {struct tms} clock_t tms_utime
diff --git a/conform/data/wordexp.h-data b/conform/data/wordexp.h-data
index 821784a..0d96d68 100644
--- a/conform/data/wordexp.h-data
+++ b/conform/data/wordexp.h-data
@@ -13,6 +13,7 @@ constant WRDE_SHOWERR
constant WRDE_UNDEF
constant WRDE_BADCHAR
+constant WRDE_BADVAL
constant WRDE_CMDSUB
constant WRDE_NOSPACE
# if !defined POSIX && !defined XOPEN2K8 && !defined POSIX2008
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5ba924e3c7b54408050cbf8024279ce837b54e64
commit 5ba924e3c7b54408050cbf8024279ce837b54e64
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Nov 19 22:19:11 2012 +0000
conformtest: Fix miscellaneous expectations for XPG4.
diff --git a/ChangeLog b/ChangeLog
index 5d18c3d..865f359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,44 @@
2012-11-19 Joseph Myers <joseph@codesourcery.com>
+ * conform/data/fcntl.h-data [XPG3 || XPG4] (O_DSYNC): Do not
+ expect.
+ [XPG3 || XPG4] (O_RSYNC): Likewise.
+ * conform/data/signal.h-data [XPG3 || XPG4] (pthread_kill):
+ Likewise.
+ [XPG3 || XPG4] (pthread_sigmask): Likewise.
+ [XPG3 || XPG4] (sigqueue): Likewise.
+ [XPG3 || XPG4] (sigtimedwait): Likewise.
+ [XPG3 || XPG4] (sigwaitinfo): Likewise.
+ * conform/data/stdio.h-data [XPG3 || XPG4] (snprintf): Likewise.
+ [XPG3 || XPG4] (vsnprintf): Likewise.
+ * conform/data/sys/stat.h-data [XPG3 || XPG4] (blkcnt_t):
+ Likewise.
+ [XPG3 || XPG4] (blksize_t): Likewise.
+ * conform/data/time.h-data [XPG3 || XPG4] (struct timespec):
+ Likewise.
+ [XPG3 || XPG4] (CLOCK_PROCESS_CPUTIME_ID): Likewise.
+ [XPG3 || XPG4] (CLOCK_THREAD_CPUTIME_ID): Likewise.
+ [XPG3 || XPG4] (struct itimerspec): Likewise.
+ [XPG3 || XPG4] (CLOCK_REALTIME): Likewise.
+ [XPG3 || XPG4] (TIMER_ABSTIME): Likewise.
+ [XPG3 || XPG4] (CLOCK_MONOTONIC): Likewise.
+ [XPG3 || XPG4] (clockid_t): Likewise.
+ [XPG3 || XPG4] (timer_t): Likewise.
+ [XPG3 || XPG4] (clock_getres): Likewise.
+ [XPG3 || XPG4] (clock_gettime): Likewise.
+ [XPG3 || XPG4] (clock_settime): Likewise.
+ [XPG3 || XPG4] (nanosleep): Likewise.
+ [XPG3 || XPG4] (timer_create): Likewise.
+ [XPG3 || XPG4] (timer_delete): Likewise.
+ [XPG3 || XPG4] (timer_gettime): Likewise.
+ [XPG3 || XPG4] (timer_getoverrun): Likewise.
+ [XPG3 || XPG4] (timer_settime): Likewise.
+ * conform/data/unistd.h-data [XPG3 || XPG4] (fdatasync): Likewise.
+ [XPG3 || XPG4] (getlogin_r): Likewise.
+ [XPG3 || XPG4] (pread): Likewise.
+ [XPG3 || XPG4] (pthread_atfork): Likewise.
+ [XPG3 || XPG4] (pwrite): Likewise.
+
[BZ #14835]
* signal/signal.h [__USE_XOPEN_EXTENDED]: Include
<bits/siginfo.h>.
diff --git a/conform/data/fcntl.h-data b/conform/data/fcntl.h-data
index 4689248..6fda308 100644
--- a/conform/data/fcntl.h-data
+++ b/conform/data/fcntl.h-data
@@ -30,10 +30,12 @@ constant O_NOCTTY
constant O_TRUNC
constant O_APPEND
-constant O_DSYNC
constant O_NONBLOCK
-constant O_RSYNC
constant O_SYNC
+#if !defined XPG3 && !defined XPG4
+constant O_DSYNC
+constant O_RSYNC
+#endif
constant O_ACCMODE
diff --git a/conform/data/signal.h-data b/conform/data/signal.h-data
index ba9019b..bb3784a 100644
--- a/conform/data/signal.h-data
+++ b/conform/data/signal.h-data
@@ -203,8 +203,10 @@ function int kill (pid_t, int)
# if !defined POSIX && !defined POSIX2008
function int killpg (pid_t, int)
# endif
+# if !defined XPG3 && !defined XPG4
function int pthread_kill (pthread_t, int)
function int pthread_sigmask (int, const sigset_t*, sigset_t*)
+# endif
function int sigaction (int, const struct sigaction*, struct sigaction*)
function int sigaddset (sigset_t*, int)
# if !defined POSIX && !defined POSIX2008
@@ -224,7 +226,9 @@ function int sigpause (int)
# endif
function int sigpending (sigset_t*)
function int sigprocmask (int, const sigset_t*, sigset_t*)
+# if !defined XPG3 && !defined XPG4
function int sigqueue (pid_t, int, const union sigval)
+# endif
# if !defined POSIX && !defined POSIX2008
function int sigrelse (int)
function void (*sigset (int, void(*)(int)))(int)
@@ -233,9 +237,13 @@ function void (*sigset (int, void(*)(int)))(int)
function int sigstack (struct sigstack*, struct sigstack*)
# endif
function int sigsuspend (const sigset_t*)
+# if !defined XPG3 && !defined XPG4
function int sigtimedwait (const sigset_t*, siginfo_t*, const struct timespec*)
+# endif
function int sigwait (const sigset_t*, int*)
+# if !defined XPG3 && !defined XPG4
function int sigwaitinfo (const sigset_t*, siginfo_t*)
+# endif
# if defined XOPEN2K8 || defined POSIX2008
function void psiginfo (const siginfo_t*, const char*)
function void psignal (int, const char*)
diff --git a/conform/data/stdio.h-data b/conform/data/stdio.h-data
index 816cf9e..ab55ce7 100644
--- a/conform/data/stdio.h-data
+++ b/conform/data/stdio.h-data
@@ -144,7 +144,7 @@ function void rewind (FILE*)
function int scanf (const char*, ...)
function void setbuf (FILE*, char*)
function int setvbuf (FILE*, char*, int, size_t)
-#if !defined ISO && !defined POSIX
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4
function int snprintf (char*, size_t, const char*, ...)
#endif
function int sprintf (char *, const char *, ...)
@@ -166,7 +166,7 @@ function int vprintf (const char*, va_list)
#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
function int vscanf (const char*, va_list)
#endif
-#if !defined ISO && !defined POSIX
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4
function int vsnprintf (char*, size_t, const char*, va_list)
#endif
function int vsprintf (char*, const char*, va_list)
diff --git a/conform/data/sys/stat.h-data b/conform/data/sys/stat.h-data
index 2a5c3bf..41c3932 100644
--- a/conform/data/sys/stat.h-data
+++ b/conform/data/sys/stat.h-data
@@ -1,6 +1,6 @@
#if !defined ISO && !defined ISO99 && !defined ISO11
-#if !defined POSIX && !defined POSIX2008
+#if !defined POSIX && !defined POSIX2008 && !defined XPG3 && !defined XPG4
type blkcnt_t
type blksize_t
#endif
diff --git a/conform/data/time.h-data b/conform/data/time.h-data
index 9b346c3..fead998 100644
--- a/conform/data/time.h-data
+++ b/conform/data/time.h-data
@@ -5,7 +5,7 @@ macro CLOCKS_PER_SEC {clock_t}
macro-int-constant TIME_UTC > 0
#endif
-#if !defined ISO && !defined ISO99
+#if !defined ISO && !defined ISO99 && !defined XPG3 && !defined XPG4
type {struct timespec}
element {struct timespec} time_t tv_sec
@@ -45,6 +45,7 @@ function int timespec_get (struct timespec *, int)
# if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
symbol CLK_TCK
# endif
+# if !defined XPG3 && !defined XPG4
constant CLOCK_PROCESS_CPUTIME_ID
constant CLOCK_THREAD_CPUTIME_ID
@@ -59,6 +60,7 @@ constant CLOCK_MONOTONIC
type clockid_t
type timer_t
+# endif
# if defined XOPEN2K8 || defined POSIX2008
type pid_t
@@ -74,30 +76,38 @@ function {char*} asctime_r (const struct tm*, char*)
#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
function int clock_getcpuclockid (pid_t, clockid_t*)
#endif
+#if !defined XPG3 && !defined XPG4
function int clock_getres (clockid_t, struct timespec*)
function int clock_gettime (clockid_t, struct timespec*)
+#endif
#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
function int clock_nanosleep (clockid_t, int, const struct timespec*, struct timespec*)
#endif
+#if !defined XPG3 && !defined XPG4
function int clock_settime (clockid_t, const struct timespec*)
+#endif
function {char*} ctime_r (const time_t*, char*)
# if !defined POSIX && !defined POSIX2008
function {struct tm*} getdate (const char*)
# endif
function {struct tm*} gmtime_r (const time_t*, struct tm*)
function {struct tm*} localtime_r (const time_t*, struct tm*)
+# if !defined XPG3 && !defined XPG4
function int nanosleep (const struct timespec*, struct timespec*)
+# endif
# if defined XOPEN2K8 || defined POSIX2008
function size_t strftime_l (char*, size_t, const char*, const struct tm*, locale_t)
# endif
# if !defined POSIX && !defined POSIX2008
function {char*} strptime (const char*, const char*, struct tm*)
# endif
+# if !defined XPG3 && !defined XPG4
function int timer_create (clockid_t, struct sigevent*, timer_t*)
function int timer_delete (timer_t)
function int timer_gettime (timer_t, struct itimerspec*)
function int timer_getoverrun (timer_t)
function int timer_settime (timer_t, int, const struct itimerspec*, struct itimerspec*)
+# endif
function void tzset (void)
# if !defined POSIX && !defined POSIX2008
diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data
index 18bea5e..f8cd02e 100644
--- a/conform/data/unistd.h-data
+++ b/conform/data/unistd.h-data
@@ -392,7 +392,9 @@ function int fchownat (int, const char*, uid_t, gid_t, int)
#ifndef POSIX
function int fchdir (int)
#endif
+#if !defined XPG3 && !defined XPG4
function int fdatasync (int)
+#endif
# if defined XOPEN2K8 || defined POSIX2008
function int fexecve (int, char *const[], char *const[])
# endif
@@ -415,7 +417,9 @@ function long gethostid (void)
function int gethostname (char*, size_t)
#endif
function {char*} getlogin (void)
+#if !defined XPG3 && !defined XPG4
function int getlogin_r (char*, size_t)
+#endif
function int getopt (int, char*const[], const char*)
#if defined XPG3 || defined XPG4 || defined UNIX98
function int getpagesize (void)
@@ -452,13 +456,13 @@ function int nice (int)
function {long int} pathconf (const char*, int)
function int pause (void)
function int pipe (int[2])
-#ifndef POSIX
+#if !defined POSIX && !defined XPG3 && !defined XPG4
function ssize_t pread (int, void*, size_t, off_t)
#endif
-#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
+#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined XPG3 && !defined XPG4
function int pthread_atfork (void(*)(void), void(*)(void), void(*)(void))
#endif
-#ifndef POSIX
+#if !defined POSIX && !defined XPG3 && !defined XPG4
function ssize_t pwrite (int, const void*, size_t, off_t)
#endif
function ssize_t read (int, void*, size_t)
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ee663277dc2e2eeab0ed18ebd9de63576661296f
commit ee663277dc2e2eeab0ed18ebd9de63576661296f
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Nov 19 22:17:58 2012 +0000
Define siginfo_t in signal.h for XPG4 (bug 14835).
diff --git a/ChangeLog b/ChangeLog
index 1031d4d..5d18c3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-19 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #14835]
+ * signal/signal.h [__USE_XOPEN_EXTENDED]: Include
+ <bits/siginfo.h>.
+
2012-11-19 Pino Toscano <toscano.pino@tiscali.it>
* malloc/mtrace.c (muntrace): Reset MALLSTREAM and the hooks before
diff --git a/NEWS b/NEWS
index 01caf53..23f1d83 100644
--- a/NEWS
+++ b/NEWS
@@ -21,7 +21,7 @@ Version 2.17
14638, 14645, 14648, 14652, 14660, 14661, 14669, 14672, 14683, 14694,
14716, 14719, 14743, 14767, 14783, 14784, 14785, 14793, 14796, 14797,
14801, 14805, 14807, 14809, 14811, 14815, 14821, 14824, 14828, 14831,
- 14838.
+ 14835, 14838.
* Port to ARM AArch64 contributed by Linaro.
diff --git a/signal/signal.h b/signal/signal.h
index a6a0590..36720d4 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -73,7 +73,9 @@ typedef __uid_t uid_t;
/* We need `struct timespec' later on. */
# define __need_timespec
# include <time.h>
+#endif
+#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED
/* Get the `siginfo_t' type plus the needed symbols. */
# include <bits/siginfo.h>
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 204 +++++++++++++++++++++++++++++++++++++++++
NEWS | 2 +-
conform/data/cpio.h-data | 2 +-
conform/data/errno.h-data | 39 ++++++++-
conform/data/fcntl.h-data | 22 +++--
conform/data/glob.h-data | 2 +-
conform/data/limits.h-data | 153 +++++++++++++++++++------------
conform/data/locale.h-data | 2 +-
conform/data/mqueue.h-data | 8 ++-
conform/data/regex.h-data | 1 +
conform/data/signal.h-data | 8 ++
conform/data/stdio.h-data | 16 ++-
conform/data/sys/stat.h-data | 2 +-
conform/data/sys/times.h-data | 2 +-
conform/data/time.h-data | 12 ++-
conform/data/unistd.h-data | 10 ++-
conform/data/wordexp.h-data | 1 +
signal/signal.h | 2 +
18 files changed, 404 insertions(+), 84 deletions(-)
hooks/post-receive
--
GNU C Library master sources