diff options
| author | Fangrui Song <maskray@google.com> | 2022-05-23 10:23:23 -0700 |
|---|---|---|
| committer | Fangrui Song <maskray@google.com> | 2022-05-23 10:23:23 -0700 |
| commit | 748df8126ac69e68e0b94e236ea3c2e11b1176cb (patch) | |
| tree | 6ae395995695cf3785f3deffeb516c27c1d5b38c | |
| parent | 9a421348cd7d0704663e26e6171828bed6e0a2cf (diff) | |
| download | glibc-748df8126ac69e68e0b94e236ea3c2e11b1176cb.tar.gz glibc-748df8126ac69e68e0b94e236ea3c2e11b1176cb.tar.xz glibc-748df8126ac69e68e0b94e236ea3c2e11b1176cb.zip | |
dlfcn: Move RTLD_DEFAULT/RTLD_NEXT outside __USE_GNU
POSIX reserves the RTLD_ namespace, and this is already reflected in our conform tests. Note: RTLD_DEFAULT and RTLD_NEXT appear in IEEE Std 1003.1-2004. Many systems (e.g. FreeBSD, musl) just define the macros unconditionally. Reviewed-by: Florian Weimer <fweimer@redhat.com> Tested-by: Florian Weimer <fweimer@redhat.com>
| -rw-r--r-- | dlfcn/dlfcn.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/dlfcn/dlfcn.h b/dlfcn/dlfcn.h index a3af6051d4..6f7cad8682 100644 --- a/dlfcn/dlfcn.h +++ b/dlfcn/dlfcn.h @@ -30,18 +30,6 @@ #ifdef __USE_GNU #include <bits/dl_find_object.h> -/* If the first argument of `dlsym' or `dlvsym' is set to RTLD_NEXT - the run-time address of the symbol called NAME in the next shared - object is returned. The "next" relation is defined by the order - the shared objects were loaded. */ -# define RTLD_NEXT ((void *) -1l) - -/* If the first argument to `dlsym' or `dlvsym' is set to RTLD_DEFAULT - the run-time address of the symbol called NAME in the global scope - is returned. */ -# define RTLD_DEFAULT ((void *) 0) - - /* Type for namespace indices. */ typedef long int Lmid_t; @@ -50,6 +38,16 @@ typedef long int Lmid_t; # define LM_ID_NEWLM -1 /* For dlmopen: request new namespace. */ #endif +/* If the first argument of `dlsym' or `dlvsym' is set to RTLD_NEXT + the run-time address of the symbol called NAME in the next shared + object is returned. The "next" relation is defined by the order + the shared objects were loaded. */ +#define RTLD_NEXT ((void *) -1l) + +/* If the first argument to `dlsym' or `dlvsym' is set to RTLD_DEFAULT + the run-time address of the symbol called NAME in the global scope + is returned. */ +#define RTLD_DEFAULT ((void *) 0) __BEGIN_DECLS |