Mercurial > pub > dyncall > dyncall
diff dynload/dynload_unix.c @ 645:6a8aac9b2bcf
- removal of `autovar` macro detection lib:
* was a good idea, but never fully pushed through, so code was duplicating most of dyncall_macros.h
* didn't find any outside use and plans to make it a standalone lib never materialized
* so basically removing code to avoid code duplication that risks to never stay in sync
| author | Tassilo Philipp |
|---|---|
| date | Mon, 05 Feb 2024 16:43:59 +0100 |
| parents | 61c485f8cc06 |
| children |
line wrap: on
line diff
--- a/dynload/dynload_unix.c Thu Dec 15 10:27:40 2022 +0100 +++ b/dynload/dynload_unix.c Mon Feb 05 16:43:59 2024 +0100 @@ -34,7 +34,7 @@ #include "dynload.h" -#include "../autovar/autovar_OS.h" +#include "../dyncall/dyncall_macros.h" #include <string.h> @@ -101,7 +101,7 @@ * RTLD_DI_LINKMAP and RTLD_SELF, which are #defines used by dlinfo() on most * supported targets, or specifically check the OS (e.g. dlinfo() is originally * from Solaris) */ -#if ((defined(RTLD_DI_LINKMAP) && defined(RTLD_SELF)) || defined(OS_SunOS)) && !defined(DL_USE_GLIBC_ITER_PHDR) +#if ((defined(RTLD_DI_LINKMAP) && defined(RTLD_SELF)) || defined(DC__OS_SunOS)) && !defined(DL_USE_GLIBC_ITER_PHDR) #include <link.h> @@ -117,7 +117,7 @@ /* specific implementation needed on Darwin -----> */ -#elif defined(OS_Darwin) +#elif defined(DC__OS_Darwin) #include <stdint.h> #include <mach-o/dyld.h> @@ -164,7 +164,7 @@ with dl_iterate_phdr (which comes from ELF program header iteration), so base it on that - skip and use dladdr()-based guessing (see below) if explicitly requested, e.g. by ./configure - Haiku/BeOS does have the headers but no implementation of dl_iterate_phdr() (at least as of 2021) */ -#elif !defined(DL_DLADDR_TO_LIBPATH) && (defined(OS_OpenBSD) || defined(DL_USE_GLIBC_ITER_PHDR) || (!defined(RTLD_SELF) && defined(__ELF__))) && !defined(OS_BeOS) +#elif !defined(DL_DLADDR_TO_LIBPATH) && (defined(DC__OS_OpenBSD) || defined(DL_USE_GLIBC_ITER_PHDR) || (!defined(RTLD_SELF) && defined(__ELF__))) && !defined(DC__OS_BeOS) #include <sys/types.h> #include <link.h>