GNU C Library master sources branch, master, updated. glibc-2.11-317-g952df0a

[drepper at sourceware dot org]

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  952df0afdca2333e9fae7d62a36077c348d2df93 (commit)
      from  9e37946dba22b53c5108eef777e867f93c894502 (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=952df0afdca2333e9fae7d62a36077c348d2df93

commit 952df0afdca2333e9fae7d62a36077c348d2df93
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Sun Apr 4 01:51:01 2010 -0700

    Fix definition and testing of S_ISSOCK.

diff --git a/ChangeLog b/ChangeLog
index 7db74b3..a178be5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-04-04  Ulrich Drepper  <drepper@redhat.com>
 
+	* conform/data/sys/stat.h-data: Fix testing of S_IS* macros.
+
+	[BZ #11279]
+	* io/sys/stat.h: Always define S_ISSOCK for XPG6 and up.
+
 	[BZ #11287]
 	* csu/Makefile ($(objpfx)version-info.h): Handle newer kernel headers
 	which don't define UTS_RELEASE.
diff --git a/conform/data/sys/stat.h-data b/conform/data/sys/stat.h-data
index df39fd3..b0e10a4 100644
--- a/conform/data/sys/stat.h-data
+++ b/conform/data/sys/stat.h-data
@@ -66,15 +66,14 @@ constant S_ISGID
 constant S_ISVTX
 #endif
 
-#if !defined POSIX && !defined POSIX2008
-macro S_IFMT
+#if !defined POSIX
 macro S_ISBLK
 macro S_ISCHR
 macro S_ISDIR
 macro S_ISFIFO
 macro S_ISREG
 macro S_ISLNK
-macro S_IFSOCK
+macro S_ISSOCK
 #endif
 
 // How to represent optional tests?
diff --git a/io/sys/stat.h b/io/sys/stat.h
index 733a927..ac740ca 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995-2004, 2005, 2006, 2007, 2009
+/* Copyright (C) 1991, 1992, 1995-2004, 2005, 2006, 2007, 2009, 2010
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -143,9 +143,11 @@ __BEGIN_DECLS
 # define S_ISLNK(mode)  0
 #endif
 
-#if (defined __USE_BSD || defined __USE_UNIX98) \
+#if (defined __USE_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K) \
     && defined __S_IFSOCK
 # define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK)
+#elif defined __USE_XOPEN2K
+# define S_ISSOCK(mode) 0
 #endif
 
 /* These are from POSIX.1b.  If the objects are not implemented using separate

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                    |    5 +++++
 conform/data/sys/stat.h-data |    5 ++---
 io/sys/stat.h                |    6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources