yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts when merging no-thread to master

Browse Source
This commit is contained in:
Nguyen Anh Quynh
2016-04-23 10:06:57 +08:00
parent bb80e699b2 ba31be79f4
commit 3a742fb6f6
32 changed files with 27 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
qemu/util/qemu-thread-win32.c
View File

@ -361,12 +361,6 @@ int qemu_thread_create(struct uc_struct *uc, QemuThread *thread, const char *nam
return 0;
}
void qemu_thread_get_self(struct uc_struct *uc, QemuThread *thread)
{
thread->data = uc->qemu_thread_data;
thread->tid = GetCurrentThreadId();
}
HANDLE qemu_thread_get_handle(QemuThread *thread)
{
QemuThreadData *data;
@ -388,8 +382,3 @@ HANDLE qemu_thread_get_handle(QemuThread *thread)
LeaveCriticalSection(&data->cs);
return handle;
}
bool qemu_thread_is_self(QemuThread *thread)
{
return GetCurrentThreadId() == thread->tid;
}