From: Ulrich Drepper Date: Fri, 9 Sep 2011 22:21:39 +0000 (-0400) Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc X-Git-Tag: glibc-2.15~315 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4899e7b9adbf74145f6530f6f57517f773e330c;p=thirdparty%2Fglibc.git Merge branch 'master' of ssh://sourceware.org/git/glibc Conflicts: ChangeLog --- e4899e7b9adbf74145f6530f6f57517f773e330c diff --cc ChangeLog index f1b1c0de51c,98661dc2b18..01d890561cb --- a/ChangeLog +++ b/ChangeLog @@@ -1,9 -1,8 +1,14 @@@ +2011-09-09 Ulrich Drepper + + [BZ #12847] + * libio/genops.c (INTDEF): For string streams the _lock pointer can + be NULL. Don't lock in this case. + + 2011-09-09 Roland McGrath + + * elf/elf.h (ELFOSABI_GNU): New macro. + (ELFOSABI_LINUX): Define to that. + 2011-07-29 Denis Zaitceff * string/strncat.c (strncat): Undef the symbol in case it has been diff --cc stdio-common/vfscanf.c index 7356eeb3626,7356eeb3626..9d312d55aa6 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@@ -1,4 -1,4 +1,4 @@@ --/* Copyright (C) 1991-2006, 2007, 2010 Free Software Foundation, Inc. ++/* Copyright (C) 1991-2006, 2007, 2010, 2011 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 @@@ -48,7 -48,7 +48,7 @@@ #if INT_MAX == LONG_MAX # define need_long 0 #else --# define need_long 1 ++# define need_long 1 #endif /* Those are flags in the conversion format. */ @@@ -102,9 -102,9 +102,9 @@@ # define __strtof_internal __wcstof_internal # define L_(Str) L##Str --# define CHAR_T wchar_t ++# define CHAR_T wchar_t # define UCHAR_T unsigned int --# define WINT_T wint_t ++# define WINT_T wint_t # undef EOF # define EOF WEOF #else @@@ -128,7 -128,7 +128,7 @@@ return EOF # define L_(Str) Str --# define CHAR_T char ++# define CHAR_T char # define UCHAR_T unsigned char # define WINT_T int #endif