diff options
| author | Ondřej Bílka <neleai@seznam.cz> | 2014-02-10 14:45:42 +0100 |
|---|---|---|
| committer | Ondřej Bílka <neleai@seznam.cz> | 2014-02-10 15:07:12 +0100 |
| commit | a1ffb40e32741f992c743e7b16c061fefa3747ac (patch) | |
| tree | 246a29a87b26cfd5d07b17070f85eb3785018de9 /dlfcn/dlmopen.c | |
| parent | 1448f3244714a9dabb5240ec18b094f100887d5c (diff) | |
| download | glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar.gz glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar.bz2 glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.zip | |
Use glibc_likely instead __builtin_expect.
Diffstat (limited to 'dlfcn/dlmopen.c')
| -rw-r--r-- | dlfcn/dlmopen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dlfcn/dlmopen.c b/dlfcn/dlmopen.c index 1e2cbcfdb4..115f6e9e28 100644 --- a/dlfcn/dlmopen.c +++ b/dlfcn/dlmopen.c @@ -64,7 +64,7 @@ dlmopen_doit (void *a) /* It makes no sense to use RTLD_GLOBAL when loading a DSO into a namespace other than the base namespace. */ - if (__builtin_expect (args->mode & RTLD_GLOBAL, 0)) + if (__glibc_unlikely (args->mode & RTLD_GLOBAL)) GLRO(dl_signal_error) (EINVAL, NULL, NULL, N_("invalid mode")); } @@ -79,7 +79,7 @@ void * __dlmopen (Lmid_t nsid, const char *file, int mode DL_CALLER_DECL) { # ifdef SHARED - if (__builtin_expect (_dlfcn_hook != NULL, 0)) + if (__glibc_unlikely (_dlfcn_hook != NULL)) return _dlfcn_hook->dlmopen (nsid, file, mode, RETURN_ADDRESS (0)); # endif |