diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 19:50:45 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 19:50:45 +0200 |
| commit | 4dd9e35bfd35d3138bc44169baba098005bad51e (patch) | |
| tree | a4939c43a9c3fe00eb27f023e14acc5e1fe8808c /dlfcn/dladdr.c | |
| parent | bd42a4599d1b6f77bcfe1e4f67b7cbd9e1cb2dfd (diff) | |
| parent | f76453c31593957fec1a99b986bfa5506618b79c (diff) | |
Merge commit 'refs/top-bases/t/bigmem' into t/bigmem
Diffstat (limited to 'dlfcn/dladdr.c')
| -rw-r--r-- | dlfcn/dladdr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dlfcn/dladdr.c b/dlfcn/dladdr.c index 2b93cec210..23a45d8ee7 100644 --- a/dlfcn/dladdr.c +++ b/dlfcn/dladdr.c @@ -1,5 +1,5 @@ /* Locate the shared object symbol nearest a given address. - Copyright (C) 1996-2014 Free Software Foundation, Inc. + Copyright (C) 1996-2015 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 @@ -18,7 +18,7 @@ #include <dlfcn.h> -#if !defined SHARED && defined IS_IN_libdl +#if !defined SHARED && IS_IN (libdl) int dladdr (const void *address, Dl_info *info) @@ -32,7 +32,7 @@ int __dladdr (const void *address, Dl_info *info) { # ifdef SHARED - if (__builtin_expect (_dlfcn_hook != NULL, 0)) + if (__glibc_unlikely (_dlfcn_hook != NULL)) return _dlfcn_hook->dladdr (address, info); # endif return _dl_addr (address, info, NULL, NULL); |