diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-10-10 15:35:46 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-10-10 15:35:46 +0000 |
commit | 2d32c4f00084f68a390e8fa4291acb49e9c0df8e (patch) | |
tree | 00964019e9307917f730b8c6b817f0cb9496a167 /libc/sysdeps/mach/hurd/malloc-machine.h | |
parent | 7dfcd4332472afda13e2ea9c0eaba15a08d8351e (diff) | |
download | eglibc2-2d32c4f00084f68a390e8fa4291acb49e9c0df8e.tar.gz |
Merge changes between r20863 and r21108 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@21109 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/mach/hurd/malloc-machine.h')
-rw-r--r-- | libc/sysdeps/mach/hurd/malloc-machine.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/sysdeps/mach/hurd/malloc-machine.h b/libc/sysdeps/mach/hurd/malloc-machine.h index 4a8bd16e6..16e054fe5 100644 --- a/libc/sysdeps/mach/hurd/malloc-machine.h +++ b/libc/sysdeps/mach/hurd/malloc-machine.h @@ -66,8 +66,9 @@ __libc_tsd_define (static, void *, MALLOC) /* declaration/common definition */ #include <sys/mman.h> -#undef madvise -#define madvise(addr, len, advice) ((void) (addr), (void) (len), (void) (advice)) +#undef __madvise +#define __madvise(addr, len, advice) \ + ((void) (addr), (void) (len), (void) (advice)) #include <sysdeps/generic/malloc-machine.h> |