Merge branch 'master' of github.com:bkaradzic/bx

This commit is contained in:
Branimir Karadžić
2017-03-10 22:40:06 -08:00
2 changed files with 4 additions and 2 deletions

View File

@@ -12,7 +12,8 @@
|| BX_PLATFORM_NACL \
|| BX_PLATFORM_IOS \
|| BX_PLATFORM_OSX \
|| BX_PLATFORM_PS4
|| BX_PLATFORM_PS4 \
|| BX_PLATFORM_RPI
# include <pthread.h>
#elif BX_PLATFORM_WINDOWS \
|| BX_PLATFORM_WINRT \

View File

@@ -10,7 +10,8 @@
|| BX_PLATFORM_NACL \
|| BX_PLATFORM_IOS \
|| BX_PLATFORM_OSX \
|| BX_PLATFORM_PS4
|| BX_PLATFORM_PS4 \
|| BX_PLATFORM_RPI
# include <pthread.h>
# if defined(__FreeBSD__)
# include <pthread_np.h>