hyung-hwan/hcl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed USE_MACH_O to USE_MACH_O_DYLD

Browse Source
This commit is contained in:
hyung-hwan 2018-10-14 12:01:51 +00:00
parent af67e44cb0
commit 19d39ca20a
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/hcl-s.c
View File

@ -73,7 +73,7 @@
# define sys_dl_close(x) dlclose(x) # define sys_dl_close(x) dlclose(x)
# define sys_dl_getsym(x,n) dlsym(x,n) # define sys_dl_getsym(x,n) dlsym(x,n)
# elif defined(__APPLE__) || defined(__MACOSX__) # elif defined(__APPLE__) || defined(__MACOSX__)
# define USE_MACH_O # define USE_MACH_O_DYLD
# include <mach-o/dyld.h> # include <mach-o/dyld.h>
# define sys_dl_error() mach_dlerror() # define sys_dl_error() mach_dlerror()
# define sys_dl_open(x) mach_dlopen(x) # define sys_dl_open(x) mach_dlopen(x)
@ -138,7 +138,7 @@
# else # else
# if defined(USE_DLFCN) # if defined(USE_DLFCN)
# define HCL_DEFAULT_PFMODPOSTFIX ".so" # define HCL_DEFAULT_PFMODPOSTFIX ".so"
# elif defined(USE_MACH_O) # elif defined(USE_MACH_O_DYLD)
# define HCL_DEFAULT_PFMODPOSTFIX ".dylib" # define HCL_DEFAULT_PFMODPOSTFIX ".dylib"
# else # else
# define HCL_DEFAULT_PFMODPOSTFIX "" # define HCL_DEFAULT_PFMODPOSTFIX ""
@ -749,7 +749,7 @@ static void syserrstrb (hcl_t* hcl, int syserr, hcl_bch_t* buf, hcl_oow_t len)
} }
/* ========================================================================= */ /* ========================================================================= */
#if defined(USE_MACH_O) #if defined(USE_MACH_O_DYLD)
static const char* mach_dlerror_str = ""; static const char* mach_dlerror_str = "";
static void* mach_dlopen (const char* path) static void* mach_dlopen (const char* path)
@ -818,7 +818,7 @@ static const char* mach_dlerror (void)
static void* dl_open (hcl_t* hcl, const hcl_ooch_t* name, int flags) static void* dl_open (hcl_t* hcl, const hcl_ooch_t* name, int flags)
{ {
#if defined(USE_LTDL) || defined(USE_DLFCN) || defined(USE_MACH_O) #if defined(USE_LTDL) || defined(USE_DLFCN) || defined(USE_MACH_O_DYLD)
hcl_bch_t stabuf[128], * bufptr; hcl_bch_t stabuf[128], * bufptr;
hcl_oow_t ucslen, bcslen, bufcapa; hcl_oow_t ucslen, bcslen, bufcapa;
void* handle; void* handle;
@ -967,7 +967,7 @@ static void* dl_open (hcl_t* hcl, const hcl_ooch_t* name, int flags)
static void dl_close (hcl_t* hcl, void* handle) static void dl_close (hcl_t* hcl, void* handle)
{ {
#if defined(USE_LTDL) || defined(USE_DLFCN) || defined(USE_MACH_O) #if defined(USE_LTDL) || defined(USE_DLFCN) || defined(USE_MACH_O_DYLD)
HCL_DEBUG1 (hcl, "Closed DL handle %p\n", handle); HCL_DEBUG1 (hcl, "Closed DL handle %p\n", handle);
sys_dl_close (handle); sys_dl_close (handle);
@ -979,7 +979,7 @@ static void dl_close (hcl_t* hcl, void* handle)
static void* dl_getsym (hcl_t* hcl, void* handle, const hcl_ooch_t* name) static void* dl_getsym (hcl_t* hcl, void* handle, const hcl_ooch_t* name)
{ {
#if defined(USE_LTDL) || defined(USE_DLFCN) || defined(USE_MACH_O) #if defined(USE_LTDL) || defined(USE_DLFCN) || defined(USE_MACH_O_DYLD)
hcl_bch_t stabuf[64], * bufptr; hcl_bch_t stabuf[64], * bufptr;
hcl_oow_t bufcapa, ucslen, bcslen, i; hcl_oow_t bufcapa, ucslen, bcslen, i;
const hcl_bch_t* symname; const hcl_bch_t* symname;

12
lib/main.c
View File

@ -74,7 +74,7 @@
# define sys_dl_close(x) dlclose(x) # define sys_dl_close(x) dlclose(x)
# define sys_dl_getsym(x,n) dlsym(x,n) # define sys_dl_getsym(x,n) dlsym(x,n)
# elif defined(__APPLE__) || defined(__MACOSX__) # elif defined(__APPLE__) || defined(__MACOSX__)
# define USE_MACH_O # define USE_MACH_O_DYLD
# include <mach-o/dyld.h> # include <mach-o/dyld.h>
# define sys_dl_error() mach_dlerror() # define sys_dl_error() mach_dlerror()
# define sys_dl_open(x) mach_dlopen(x) # define sys_dl_open(x) mach_dlopen(x)
@ -131,7 +131,7 @@
# else # else
# if defined(USE_DLFCN) # if defined(USE_DLFCN)
# define HCL_DEFAULT_PFMODPOSTFIX ".so" # define HCL_DEFAULT_PFMODPOSTFIX ".so"
# elif defined(USE_MACH_O) # elif defined(USE_MACH_O_DYLD)
# define HCL_DEFAULT_PFMODPOSTFIX ".dylib" # define HCL_DEFAULT_PFMODPOSTFIX ".dylib"
# else # else
# define HCL_DEFAULT_PFMODPOSTFIX "" # define HCL_DEFAULT_PFMODPOSTFIX ""
@ -784,7 +784,7 @@ static void syserrstrb (hcl_t* hcl, int syserr, hcl_bch_t* buf, hcl_oow_t len)
} }
/* ========================================================================= */ /* ========================================================================= */
#if defined(USE_MACH_O) #if defined(USE_MACH_O_DYLD)
static const char* mach_dlerror_str = ""; static const char* mach_dlerror_str = "";
static void* mach_dlopen (const char* path) static void* mach_dlopen (const char* path)
@ -853,7 +853,7 @@ static const char* mach_dlerror (void)
static void* dl_open (hcl_t* hcl, const hcl_ooch_t* name, int flags) static void* dl_open (hcl_t* hcl, const hcl_ooch_t* name, int flags)
{ {
#if defined(USE_LTDL) || defined(USE_DLFCN) || defined(USE_MACH_O) #if defined(USE_LTDL) || defined(USE_DLFCN) || defined(USE_MACH_O_DYLD)
hcl_bch_t stabuf[128], * bufptr; hcl_bch_t stabuf[128], * bufptr;
hcl_oow_t ucslen, bcslen, bufcapa; hcl_oow_t ucslen, bcslen, bufcapa;
void* handle; void* handle;
@ -1002,7 +1002,7 @@ static void* dl_open (hcl_t* hcl, const hcl_ooch_t* name, int flags)
static void dl_close (hcl_t* hcl, void* handle) static void dl_close (hcl_t* hcl, void* handle)
{ {
#if defined(USE_LTDL) || defined(USE_DLFCN) || defined(USE_MACH_O) #if defined(USE_LTDL) || defined(USE_DLFCN) || defined(USE_MACH_O_DYLD)
HCL_DEBUG1 (hcl, "Closed DL handle %p\n", handle); HCL_DEBUG1 (hcl, "Closed DL handle %p\n", handle);
sys_dl_close (handle); sys_dl_close (handle);
@ -1014,7 +1014,7 @@ static void dl_close (hcl_t* hcl, void* handle)
static void* dl_getsym (hcl_t* hcl, void* handle, const hcl_ooch_t* name) static void* dl_getsym (hcl_t* hcl, void* handle, const hcl_ooch_t* name)
{ {
#if defined(USE_LTDL) || defined(USE_DLFCN) || defined(USE_MACH_O) #if defined(USE_LTDL) || defined(USE_DLFCN) || defined(USE_MACH_O_DYLD)
hcl_bch_t stabuf[64], * bufptr; hcl_bch_t stabuf[64], * bufptr;
hcl_oow_t bufcapa, ucslen, bcslen, i; hcl_oow_t bufcapa, ucslen, bcslen, i;
const hcl_bch_t* symname; const hcl_bch_t* symname;