about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorRainbowC0 <67918391+RainbowC0@users.noreply.github.com>2023-02-05 18:11:29 +0800
committerGitHub <noreply@github.com>2023-02-05 11:11:29 +0100
commitbc8227d2bda7124c354bb9b618c5feea0dc60db7 (patch)
tree8c14dae7fad5f9555db82bb729b6645cacdc3d76 /src
parent09e748d6c90e4ded09cb966c9b30c49bea9895eb (diff)
downloadbox64-bc8227d2bda7124c354bb9b618c5feea0dc60db7.tar.gz
box64-bc8227d2bda7124c354bb9b618c5feea0dc60db7.zip
Changes for Alpine (#508)
* Update CMakeLists.txt

Replaced bash with sh so that it can be compiled on Alpine

* Update elfloader.c

* Update threads.c

Replaced __clock_id with clock_id to adapted to Alpine.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/elfs/elfloader.c3
-rwxr-xr-xsrc/libtools/threads.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/elfs/elfloader.c b/src/elfs/elfloader.c
index 94c5a93e..69c7797d 100755
--- a/src/elfs/elfloader.c
+++ b/src/elfs/elfloader.c
@@ -10,6 +10,9 @@
 #include <link.h>
 #include <unistd.h>
 #include <errno.h>
+#ifndef _DLFCN_H
+#include <dlfcn.h>
+#endif
 
 #include "custommem.h"
 #include "box64version.h"
diff --git a/src/libtools/threads.c b/src/libtools/threads.c
index d1131363..7e70b160 100755
--- a/src/libtools/threads.c
+++ b/src/libtools/threads.c
@@ -726,7 +726,7 @@ EXPORT int my_pthread_cond_wait(x64emu_t* emu, pthread_cond_t* cond, void* mutex
 	updateAlignedMutex(mutex, real);
 	return ret;
 }
-EXPORT int my_pthread_cond_clockwait(x64emu_t *emu, pthread_cond_t* cond, void* mutex, __clockid_t __clock_id, const struct timespec* __abstime)
+EXPORT int my_pthread_cond_clockwait(x64emu_t *emu, pthread_cond_t* cond, void* mutex, clockid_t __clock_id, const struct timespec* __abstime)
 {
 	(void)emu;
 	int ret;