80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Renamed the event struct, should properly fix building thread.cpp on termux without breaking other OS'es.

Browse Source
This commit is contained in:
OBattler
2024-08-26 17:12:25 +02:00
parent a33f8ffa37
commit f9b80f1a10
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/thread.cpp
View File

@@ -5,16 +5,12 @@
#include <86box/plat.h> #include <86box/plat.h>
#include <86box/thread.h> #include <86box/thread.h>
#if !defined(__unix__) struct event_cpp11_ex_t {
struct event_cpp11_t {
std::condition_variable cond; std::condition_variable cond;
std::mutex mutex; std::mutex mutex;
bool state = false; bool state = false;
}; };
#endif
extern "C" { extern "C" {
thread_t * thread_t *
@@ -86,14 +82,14 @@ thread_close_mutex(mutex_t *_mutex)
event_t * event_t *
thread_create_event() thread_create_event()
{ {
auto ev = new event_cpp11_t; auto ev = new event_cpp11_ex_t;
return ev; return ev;
} }
int int
thread_wait_event(event_t *handle, int timeout) thread_wait_event(event_t *handle, int timeout)
{ {
auto event = reinterpret_cast<event_cpp11_t *>(handle); auto event = reinterpret_cast<event_cpp11_ex_t *>(handle);
auto lock = std::unique_lock<std::mutex>(event->mutex); auto lock = std::unique_lock<std::mutex>(event->mutex);
if (timeout < 0) { if (timeout < 0) {
@@ -116,7 +112,7 @@ thread_wait_event(event_t *handle, int timeout)
void void
thread_set_event(event_t *handle) thread_set_event(event_t *handle)
{ {
auto event = reinterpret_cast<event_cpp11_t *>(handle); auto event = reinterpret_cast<event_cpp11_ex_t *>(handle);
{ {
auto lock = std::unique_lock<std::mutex>(event->mutex); auto lock = std::unique_lock<std::mutex>(event->mutex);
event->state = true; event->state = true;
@@ -127,7 +123,7 @@ thread_set_event(event_t *handle)
void void
thread_reset_event(event_t *handle) thread_reset_event(event_t *handle)
{ {
auto event = reinterpret_cast<event_cpp11_t *>(handle); auto event = reinterpret_cast<event_cpp11_ex_t *>(handle);
auto lock = std::unique_lock<std::mutex>(event->mutex); auto lock = std::unique_lock<std::mutex>(event->mutex);
event->state = false; event->state = false;
} }
@@ -135,7 +131,7 @@ thread_reset_event(event_t *handle)
void void
thread_destroy_event(event_t *handle) thread_destroy_event(event_t *handle)
{ {
auto event = reinterpret_cast<event_cpp11_t *>(handle); auto event = reinterpret_cast<event_cpp11_ex_t *>(handle);
delete event; delete event;
} }
} }