GNU C Library master sources branch, master, updated. glibc-2.14-227-gd48e586

[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  d48e586806e3a2a676c60b9b1bf321b0d097fab4 (commit)
      from  554881ef206db3e749602309fdb6b191e7ed09b4 (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=d48e586806e3a2a676c60b9b1bf321b0d097fab4

commit d48e586806e3a2a676c60b9b1bf321b0d097fab4
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Mon Sep 5 17:31:23 2011 -0400

    Fix glob.h header by removing gcc 1.x support

diff --git a/ChangeLog b/ChangeLog
index 4419b9b..8a45478 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-09-05  Ulrich Drepper  <drepper@gmail.com>
 
+	[BZ #13150]
+	* posix/glob.h: Remove gcc 1.x support.
+
 	[BZ #13068]
 	* elf/dl-misc.c (_dl_sysdep_read_whole_file): Use O_CLOEXEC.
 
diff --git a/NEWS b/NEWS
index c7bb2c6..a9f951a 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.15
 * The following bugs are resolved with this release:
 
   9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007, 13021,
-  13068, 13114, 13144
+  13068, 13114, 13144, 13150
 
 * New program pldd to list loaded object of a process
   Implemented by Ulrich Drepper.
diff --git a/posix/glob.h b/posix/glob.h
index 89a1886..a5153e8 100644
--- a/posix/glob.h
+++ b/posix/glob.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1995-1998,2000,2001,2004,2010
+/* Copyright (C) 1991,1992,1995-1998,2000,2001,2004,2010,2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -26,17 +26,9 @@ __BEGIN_DECLS
 
 /* We need `size_t' for the following definitions.  */
 #ifndef __size_t
-# if defined __GNUC__ && __GNUC__ >= 2
 typedef __SIZE_TYPE__ __size_t;
-#  if defined __USE_XOPEN || __USE_XOPEN2K8
+# if defined __USE_XOPEN || __USE_XOPEN2K8
 typedef __SIZE_TYPE__ size_t;
-#  endif
-# else
-#  include <stddef.h>
-#  ifndef __size_t
-#   define __size_t size_t
-#  endif
-# endif
 #else
 /* The GNU CC stddef.h version defines __size_t as empty.  We need a real
    definition.  */
@@ -143,11 +135,6 @@ typedef struct
   } glob64_t;
 #endif
 
-#if __USE_FILE_OFFSET64 && __GNUC__ < 2
-# define glob glob64
-# define globfree globfree64
-#endif
-
 /* Do glob searching for PATTERN, placing results in PGLOB.
    The bits defined above may be set in FLAGS.
    If a directory cannot be opened or read and ERRFUNC is not nil,
@@ -156,7 +143,7 @@ typedef struct
    `glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
    If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
    Otherwise, `glob' returns zero.  */
-#if !defined __USE_FILE_OFFSET64 || __GNUC__ < 2
+#if !defined __USE_FILE_OFFSET64
 extern int glob (__const char *__restrict __pattern, int __flags,
 		 int (*__errfunc) (__const char *, int),
 		 glob_t *__restrict __pglob) __THROW;

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

Summary of changes:
 ChangeLog    |    3 +++
 NEWS         |    2 +-
 posix/glob.h |   19 +++----------------
 3 files changed, 7 insertions(+), 17 deletions(-)


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