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-38-g8048311
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Jul 2012 22:38:24 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.16-ports-merge-38-g8048311
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 8048311a50ae9ca55adaba97c64e873dfdd41091 (commit)
from b637d46e7a900f516849487a5c4de734d4b3020d (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=8048311a50ae9ca55adaba97c64e873dfdd41091
commit 8048311a50ae9ca55adaba97c64e873dfdd41091
Author: Joseph Myers <joseph@codesourcery.com>
Date: Sun Jul 15 22:38:11 2012 +0000
conformtest: Update expectations for string.h.
diff --git a/ChangeLog b/ChangeLog
index 70d8b99..4c79b82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-15 Joseph Myers <joseph@codesourcery.com>
+
+ * conform/data/string.h-data (NULL): Use macro-constant. Require
+ equal to 0.
+ [ISO || ISO99 || ISO11] (stddef.h): Do not allow header.
+ (str*): Change to str[abcdefghijklmnopqrstuvwxyz]*.
+ (wcs*): Change to wcs[abcdefghijklmnopqrstuvwxyz]*.
+ (mem[abcdefghijklmnopqrstuvwxyz]*): Allow.
+ [ISO || ISO99 || ISO11] (*_t): Do not allow.
+
2012-07-13 Andreas Jaeger <aj@suse.de>
* po/fr.po: Update from translation team.
diff --git a/conform/data/string.h-data b/conform/data/string.h-data
index 0403c2e..365a537 100644
--- a/conform/data/string.h-data
+++ b/conform/data/string.h-data
@@ -1,4 +1,4 @@
-constant NULL
+macro-constant NULL == 0
type size_t
#if defined XOPEN2K8 || defined POSIX2008
@@ -61,8 +61,13 @@ function size_t strxfrm (char*, const char*, size_t)
function size_t strxfrm_l (char*, const char*, size_t, locale_t)
#endif
+#if !defined ISO && !defined ISO99 && !defined ISO11
allow-header stddef.h
+#endif
-allow str*
-allow wcs*
+allow str[abcdefghijklmnopqrstuvwxyz]*
+allow mem[abcdefghijklmnopqrstuvwxyz]*
+allow wcs[abcdefghijklmnopqrstuvwxyz]*
+#if !defined ISO && !defined ISO99 && !defined ISO11
allow *_t
+#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 10 ++++++++++
conform/data/string.h-data | 11 ++++++++---
2 files changed, 18 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources