AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 11:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://sourceware.org/git/glibc

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Ulrich Drepper 2012-01-07 10:39:03 -05:00
commit fbb68a84ee
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -7,6 +7,13 @@
* string/test-strcpy.c (do_one_test): Fix format string for WIDE use.
2012-01-06 Joseph Myers <joseph@codesourcery.com>
[BZ #13566]
* assert/assert.h (static_assert): Don't define for C++.
* libio/stdio.h (gets): Do declare for C++ <= C++11.
* wcsmbs/uchar.h (char16_t, char32_t): Don't typedef for C++11.
2012-01-03 Ulrich Drepper <drepper@gmail.com>
* iconv/loop.c (single loop): Fix assertion in storing of

4
assert/assert.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,1992,1994-2001,2003,2004,2007,2011
/* Copyright (C) 1991,1992,1994-2001,2003,2004,2007,2011,2012
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@ -115,7 +115,7 @@ __END_DECLS
#endif /* NDEBUG. */
#ifdef __USE_ISOC11
#if defined __USE_ISOC11 && !defined __cplusplus
/* Static assertion. Requires support in the compiler. */
# undef static_assert
# define static_assert _Static_assert

7
libio/stdio.h
View File

@ -1,5 +1,5 @@
/* Define ISO C stdio on top of C++ iostreams.
Copyright (C) 1991, 1994-2010, 2011 Free Software Foundation, Inc.
Copyright (C) 1991, 1994-2011, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -628,13 +628,16 @@ __BEGIN_NAMESPACE_STD
extern char *fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
__wur;
#ifndef __USE_ISOC11
#if !defined __USE_ISOC11 \
|| (defined __cplusplus && __cplusplus <= 201103L)
/* Get a newline-terminated string from stdin, removing the newline.
DO NOT USE THIS FUNCTION!! There is no limit on how much it will read.
The function has been officially removed in ISO C11. This opportunity
is used to also remove it from the GNU feature list. It is now only
available when explicitly using an old ISO C, Unix, or POSIX standard.
GCC defines _GNU_SOURCE when building C++ code and the function is still
in C++11, so it is also available for C++.
This function is a possible cancellation point and therefore not
marked with __THROW. */

4
wcsmbs/uchar.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Free Software Foundation, Inc.
/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -40,7 +40,7 @@ __END_NAMESPACE_C99
#endif
#ifdef __GNUC__
#if defined __GNUC__ && !defined __USE_ISOCXX11
/* Define the 16-bit and 32-bit character types. Use the information
provided by the compiler. */
# if !defined __CHAR16_TYPE__ || !defined __CHAR32_TYPE__