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

Merge branch 'master' of git://sources.redhat.com/git/glibc

This commit is contained in:
Kaz Kojima 2012-02-16 07:21:37 +09:00
parent df83af673b d2c736f809
commit af1dd5d680
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18,6 +18,9 @@
2012-02-15 Roland McGrath <roland@hack.frob.com>
[BZ #4822]
* sysdeps/mach/hurd/malloc-machine.h (madvise): New macro.
* mach/devstream.c (cookie_io_functions_t): Macro removed.
(write, read, close): Likewise.
Patch by Aurelien Jarno <aurelien@aurel32.net>.

6
sysdeps/mach/hurd/malloc-machine.h
View File

@ -1,6 +1,6 @@
/* Basic platform-independent macro definitions for mutexes,
thread-specific data and parameters for malloc.
Copyright (C) 2003, 2008 Free Software Foundation, Inc.
Copyright (C) 2003-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
@ -62,6 +62,10 @@ __libc_tsd_define (static, void *, MALLOC) /* declaration/common definition */
#define tsd_setspecific(key, data) __libc_tsd_set (void *, MALLOC, (data))
#define tsd_getspecific(key, vptr) ((vptr) = __libc_tsd_get (void *, MALLOC))
/* madvise is a stub on Hurd, so don't bother calling it. */
#undef madvise
#define madvise(addr, len, advice) ((void) ((addr), (len), (advice)))
#include <sysdeps/generic/malloc-machine.h>
#endif /* !defined(_MALLOC_MACHINE_H) */