OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Conflicts:
	ChangeLog
This commit is contained in:
Ulrich Drepper 2011-08-11 13:02:45 -04:00
parent 14d9678512 6761ac045d
commit 2df1f7be58
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -6,6 +6,14 @@
* dirent/scandirat64.c (SCANDIRAT): Remove underscores.
* sysdeps/unix/sysv/linux/i386/scandir64.c (SCANDIRAT): Likewise.
2011-08-10 David S. Miller <davem@davemloft.net>
* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Add missing comma in
enum.
* sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise.
2011-08-09 Ulrich Drepper <drepper@gmail.com>
* Versions.def [libc]: Add GLIBC_2.15.

2
sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
View File

@ -108,7 +108,7 @@ enum __ptrace_request
#define PT_GETSIGINFO PTRACE_GETSIGINFO
/* Set new siginfo for process. */
PTRACE_SETSIGINFO = 0x4203
PTRACE_SETSIGINFO = 0x4203,
#define PT_SETSIGINFO PTRACE_SETSIGINFO
/* Get register content. */

2
sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
View File

@ -95,7 +95,7 @@ enum __ptrace_request
#define PT_GETSIGINFO PTRACE_GETSIGINFO
/* Set new siginfo for process. */
PTRACE_SETSIGINFO = 0x4203
PTRACE_SETSIGINFO = 0x4203,
#define PT_SETSIGINFO PTRACE_SETSIGINFO
/* Get register content. */

2
sysdeps/unix/sysv/linux/s390/sys/ptrace.h
View File

@ -134,7 +134,7 @@ enum __ptrace_request
#define PT_GETSIGINFO PTRACE_GETSIGINFO
/* Set new siginfo for process. */
PTRACE_SETSIGINFO = 0x4203
PTRACE_SETSIGINFO = 0x4203,
#define PT_SETSIGINFO PTRACE_SETSIGINFO
/* Get register content. */

2
sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
View File

@ -179,7 +179,7 @@ enum __ptrace_request
#define PT_GETSIGINFO PTRACE_GETSIGINFO
/* Set new siginfo for process. */
PTRACE_SETSIGINFO = 0x4203
PTRACE_SETSIGINFO = 0x4203,
#define PT_SETSIGINFO PTRACE_SETSIGINFO
/* Get register content. */