Mercurial > pub > dyncall > dyncall
diff dynload/dynload_syms_mach-o.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_syms_mach-o.c Thu Dec 15 10:27:40 2022 +0100 +++ b/dynload/dynload_syms_mach-o.c Mon Feb 05 16:43:59 2024 +0100 @@ -34,15 +34,14 @@ #include "dynload.h" #include "dynload_alloc.h" -#include "../autovar/autovar_ARCH.h" -#include "../autovar/autovar_OS.h" +#include "../dyncall/dyncall_macros.h" #include <mach-o/dyld.h> #include <mach-o/nlist.h> #include <dlfcn.h> #include <string.h> -#if defined(ARCH_X64) || defined(ARCH_PPC64) || defined(ARCH_ARM64) /*@@@ use dyncall_macros.h*/ +#if defined(DC__Arch_AMD64) || defined(DC__Arch_PPC64) || defined(DC__Arch_ARM64) #define MACH_HEADER_TYPE mach_header_64 #define MACH_HEADER_MAGIC_NR MH_MAGIC_64 #define SEGMEND_COMMAND_ID LC_SEGMENT_64 @@ -228,7 +227,7 @@ /* Return name - handles lookup of indirect names. */ return &pSyms->pStringTable[(t == N_INDR ? nl->n_value : nl->n_un.n_strx) -#if defined(OS_Darwin) +#if defined(DC__OS_Darwin) + 1 /* Skip '_'-prefix */ #endif ];