diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-09 18:21:39 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-09 18:21:39 -0400 |
| commit | e4899e7b9adbf74145f6530f6f57517f773e330c (patch) | |
| tree | f8cc421a27739d5e2775478cac6707bd414949d1 | |
| parent | f22e10748fbabbf07161eb7a5540b8c0e18553c4 (diff) | |
| parent | 0a2349f929e937fb335ba53e217c05f5aa5d66d5 (diff) | |
| download | glibc-e4899e7b9adbf74145f6530f6f57517f773e330c.tar.gz glibc-e4899e7b9adbf74145f6530f6f57517f773e330c.tar.xz glibc-e4899e7b9adbf74145f6530f6f57517f773e330c.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | elf/elf.h | 3 | ||||
| -rw-r--r-- | stdio-common/vfscanf.c | 10 |
3 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index f1b1c0de51..01d890561c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ * libio/genops.c (INTDEF): For string streams the _lock pointer can be NULL. Don't lock in this case. +2011-09-09 Roland McGrath <roland@hack.frob.com> + + * elf/elf.h (ELFOSABI_GNU): New macro. + (ELFOSABI_LINUX): Define to that. + 2011-07-29 Denis Zaitceff <zaitceff@gmail.com> * string/strncat.c (strncat): Undef the symbol in case it has been @@ -13,7 +18,7 @@ * elf/sotruss.ksh: Clean up, fix, and complete help messages. - * elf/dl-iteratephdr.c (hidden_proto): Fill in data from the real + * elf/dl-iteratephdr.c (__dl_iterate_phdr): Fill in data from the real link map. 2011-08-17 Andreas Jaeger <aj@suse.de> diff --git a/elf/elf.h b/elf/elf.h index 47db25c162..7c64120782 100644 --- a/elf/elf.h +++ b/elf/elf.h @@ -142,7 +142,8 @@ typedef struct #define ELFOSABI_SYSV 0 /* Alias. */ #define ELFOSABI_HPUX 1 /* HP-UX */ #define ELFOSABI_NETBSD 2 /* NetBSD. */ -#define ELFOSABI_LINUX 3 /* Linux. */ +#define ELFOSABI_GNU 3 /* Object uses GNU ELF extensions. */ +#define ELFOSABI_LINUX ELFOSABI_GNU /* Compatibility alias. */ #define ELFOSABI_SOLARIS 6 /* Sun Solaris. */ #define ELFOSABI_AIX 7 /* IBM AIX. */ #define ELFOSABI_IRIX 8 /* SGI Irix. */ diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index 7356eeb362..9d312d55aa 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -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 @@ #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 @@ # 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 @@ return EOF # define L_(Str) Str -# define CHAR_T char +# define CHAR_T char # define UCHAR_T unsigned char # define WINT_T int #endif |