Merge pull request #1662 from 86Box/master

Bring the branch up to par with master.
This commit is contained in:
Miran Grča
2021-09-05 20:31:53 +02:00
committed by GitHub
9 changed files with 2304 additions and 1654 deletions

View File

@@ -3,6 +3,9 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#if defined(__APPLE__) && defined(__aarch64__)
#include <pthread.h>
#endif
#include <wchar.h>
#include <math.h>
#ifndef INFINITY
@@ -31,6 +34,9 @@
#endif
#include "386_common.h"
#if defined(__APPLE__) && defined(__aarch64__)
#include <pthread.h>
#endif
#define CPU_BLOCK_END() cpu_block_end = 1